Make DeathIndicatorPlugin use LocalPlayerDeath (#4745)

Switches death check from AnimationChanged event to LocalPlayerDeath event.
This commit is contained in:
c01dc0ffee
2018-08-06 14:46:27 -05:00
committed by Tomas Slusny
parent 6cd71a9a34
commit 8f51786079

View File

@@ -34,16 +34,14 @@ import java.time.temporal.ChronoUnit;
import java.util.Set; import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import static net.runelite.api.AnimationID.DEATH;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.ItemID; import net.runelite.api.ItemID;
import net.runelite.api.Player;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.AnimationChanged;
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;
import net.runelite.api.events.LocalPlayerDeath;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemManager;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
@@ -145,13 +143,9 @@ public class DeathIndicatorPlugin extends Plugin
} }
@Subscribe @Subscribe
public void onAnimationChanged(AnimationChanged animationChanged) public void onLocalPlayerDeath(LocalPlayerDeath death)
{ {
Player local = client.getLocalPlayer(); if (client.isInInstancedRegion())
if (animationChanged.getActor() != local
|| local.getAnimation() != DEATH
|| client.isInInstancedRegion()
|| local.getHealthRatio() != 0)
{ {
return; return;
} }