ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

death indicator: move location check to after respawn

Browse Source
This commit is contained in:
Adam
2018-06-03 15:22:21 -04:00
parent 2f1de8fa68
commit 78d69dcc5c
1 changed files with 34 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java
View File

@@ -36,11 +36,9 @@ import java.util.Set;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
@@ -80,8 +78,6 @@ public class DeathIndicatorPlugin extends Plugin
private Timer deathTimer; private Timer deathTimer;
private boolean hasRespawned = true;
private WorldPoint lastDeath; private WorldPoint lastDeath;
private Instant lastDeathTime; private Instant lastDeathTime;
private int lastDeathWorld; private int lastDeathWorld;
@@ -162,67 +158,54 @@ public class DeathIndicatorPlugin extends Plugin
return; return;
} }
hasRespawned = false;
lastDeath = client.getLocalPlayer().getWorldLocation(); lastDeath = client.getLocalPlayer().getWorldLocation();
lastDeathWorld = client.getWorld(); lastDeathWorld = client.getWorld();
lastDeathTime = Instant.now(); lastDeathTime = Instant.now();
} }
@Subscribe @Subscribe
public void onChatMessage(ChatMessage event) public void onGameTick(GameTick event)
{ {
if (event.getType() != ChatMessageType.SERVER)
{
return;
}
if (lastDeath == null || !event.getMessage().equals("Oh dear, you are dead!"))
{
return;
}
// Check if player respawned in a death respawn location // Check if player respawned in a death respawn location
int region = client.getLocalPlayer().getWorldLocation().getRegionID(); if (lastDeath != null && !client.getLocalPlayer().getWorldLocation().equals(lastDeath))
if (!RESPAWN_REGIONS.contains(region))
{ {
log.debug("Died, but did not respawn in a known respawn location: {}", region); if (!RESPAWN_REGIONS.contains(client.getLocalPlayer().getWorldLocation().getRegionID()))
{
log.debug("Died, but did not respawn in a known respawn location: {}",
client.getLocalPlayer().getWorldLocation().getRegionID());
lastDeath = null;
lastDeathTime = null;
return;
}
log.debug("Died! Grave at {}", lastDeath);
// Save death to config
config.deathLocationX(lastDeath.getX());
config.deathLocationY(lastDeath.getY());
config.deathLocationPlane(lastDeath.getPlane());
config.timeOfDeath(lastDeathTime);
config.deathWorld(lastDeathWorld);
if (config.showDeathHintArrow())
{
client.setHintArrow(lastDeath);
}
if (config.showDeathOnWorldMap())
{
worldMapPointManager.removeIf(DeathWorldMapPoint.class::isInstance);
worldMapPointManager.add(new DeathWorldMapPoint(lastDeath));
}
resetInfobox();
lastDeath = null; lastDeath = null;
lastDeathTime = null; lastDeathTime = null;
return;
} }
hasRespawned = true; if (!hasDied() || client.getWorld() != config.deathWorld())
// Save death to config
config.deathLocationX(lastDeath.getX());
config.deathLocationY(lastDeath.getY());
config.deathLocationPlane(lastDeath.getPlane());
config.timeOfDeath(lastDeathTime);
config.deathWorld(lastDeathWorld);
if (config.showDeathHintArrow())
{
client.setHintArrow(lastDeath);
}
if (config.showDeathOnWorldMap())
{
worldMapPointManager.removeIf(DeathWorldMapPoint.class::isInstance);
worldMapPointManager.add(new DeathWorldMapPoint(lastDeath));
}
resetInfobox();
lastDeath = null;
lastDeathTime = null;
}
@Subscribe
public void onGameTick(GameTick event)
{
if (!hasDied() || !hasRespawned || (client.getWorld() != config.deathWorld()))
{ {
return; return;
} }