diff --git a/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java b/runelite-api/src/main/java/net/runelite/api/events/PlayerDeath.java similarity index 90% rename from runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java rename to runelite-api/src/main/java/net/runelite/api/events/PlayerDeath.java index e46b815f49..0b048818c8 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java +++ b/runelite-api/src/main/java/net/runelite/api/events/PlayerDeath.java @@ -24,9 +24,14 @@ */ package net.runelite.api.events; +import lombok.Value; +import net.runelite.api.Player; + /** - * An event when the local player dies. + * An event fired when a player dies. */ -public class LocalPlayerDeath +@Value +public class PlayerDeath { + private final Player player; } 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 4db2cce475..3667439385 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 @@ -40,7 +40,7 @@ import net.runelite.api.coords.WorldPoint; import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; -import net.runelite.api.events.LocalPlayerDeath; +import net.runelite.api.events.PlayerDeath; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ItemManager; @@ -145,9 +145,9 @@ public class DeathIndicatorPlugin extends Plugin } @Subscribe - public void onLocalPlayerDeath(LocalPlayerDeath death) + public void onPlayerDeath(PlayerDeath playerDeath) { - if (client.isInInstancedRegion()) + if (client.isInInstancedRegion() || playerDeath.getPlayer() != client.getLocalPlayer()) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index c32ae795e8..1c4123e795 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -65,7 +65,7 @@ import net.runelite.api.SpriteID; import net.runelite.api.WorldType; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameTick; -import net.runelite.api.events.LocalPlayerDeath; +import net.runelite.api.events.PlayerDeath; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.Widget; import static net.runelite.api.widgets.WidgetID.BARROWS_REWARD_GROUP_ID; @@ -279,9 +279,9 @@ public class ScreenshotPlugin extends Plugin } @Subscribe - public void onLocalPlayerDeath(LocalPlayerDeath death) + public void onPlayerDeath(PlayerDeath playerDeath) { - if (config.screenshotPlayerDeath()) + if (playerDeath.getPlayer() == client.getLocalPlayer() && config.screenshotPlayerDeath()) { takeScreenshot("Death " + format(new Date())); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 8408b3b4d4..0a2772f253 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -53,7 +53,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.GraphicChanged; import net.runelite.api.events.ItemContainerChanged; -import net.runelite.api.events.LocalPlayerDeath; +import net.runelite.api.events.PlayerDeath; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.VarbitChanged; @@ -886,9 +886,12 @@ public class TimersPlugin extends Plugin } @Subscribe - public void onLocalPlayerDeath(LocalPlayerDeath event) + public void onPlayerDeath(PlayerDeath playerDeath) { - infoBoxManager.removeIf(t -> t instanceof TimerTimer && ((TimerTimer) t).getTimer().isRemovedOnDeath()); + if (playerDeath.getPlayer() == client.getLocalPlayer()) + { + infoBoxManager.removeIf(t -> t instanceof TimerTimer && ((TimerTimer) t).getTimer().isRemovedOnDeath()); + } } private TimerTimer createGameTimer(final GameTimer timer)