From 8f517860794df30b32103004d67bfd17488c73e4 Mon Sep 17 00:00:00 2001 From: c01dc0ffee <38895080+c01dc0ffee@users.noreply.github.com> Date: Mon, 6 Aug 2018 14:46:27 -0500 Subject: [PATCH] Make DeathIndicatorPlugin use LocalPlayerDeath (#4745) Switches death check from AnimationChanged event to LocalPlayerDeath event. --- .../plugins/deathindicator/DeathIndicatorPlugin.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java index 133a34cbb1..53bff2e7ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java @@ -34,16 +34,14 @@ import java.time.temporal.ChronoUnit; import java.util.Set; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; -import static net.runelite.api.AnimationID.DEATH; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.ItemID; -import net.runelite.api.Player; import net.runelite.api.coords.WorldPoint; -import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.LocalPlayerDeath; import net.runelite.client.config.ConfigManager; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; @@ -145,13 +143,9 @@ public class DeathIndicatorPlugin extends Plugin } @Subscribe - public void onAnimationChanged(AnimationChanged animationChanged) + public void onLocalPlayerDeath(LocalPlayerDeath death) { - Player local = client.getLocalPlayer(); - if (animationChanged.getActor() != local - || local.getAnimation() != DEATH - || client.isInInstancedRegion() - || local.getHealthRatio() != 0) + if (client.isInInstancedRegion()) { return; }