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

api: change LocalPlayerDeath event to PlayerDeath

Browse Source
This commit is contained in:
Adam
2019-11-10 14:33:03 -05:00
parent ff6ae58898
commit 52c3a1902f
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java → runelite-api/src/main/java/net/runelite/api/events/PlayerDeath.java
View File

@@ -24,9 +24,14 @@
*/ */
package net.runelite.api.events; 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;
} }

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

@@ -40,7 +40,7 @@ import net.runelite.api.coords.WorldPoint;
import net.runelite.client.events.ConfigChanged; import net.runelite.client.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.api.events.PlayerDeath;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemManager;
@@ -145,9 +145,9 @@ public class DeathIndicatorPlugin extends Plugin
} }
@Subscribe @Subscribe
public void onLocalPlayerDeath(LocalPlayerDeath death) public void onPlayerDeath(PlayerDeath playerDeath)
{ {
if (client.isInInstancedRegion()) if (client.isInInstancedRegion() || playerDeath.getPlayer() != client.getLocalPlayer())
{ {
return; return;
} }

6
runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
View File

@@ -65,7 +65,7 @@ import net.runelite.api.SpriteID;
import net.runelite.api.WorldType; import net.runelite.api.WorldType;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.GameTick; 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.events.WidgetLoaded;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
import static net.runelite.api.widgets.WidgetID.BARROWS_REWARD_GROUP_ID; import static net.runelite.api.widgets.WidgetID.BARROWS_REWARD_GROUP_ID;
@@ -279,9 +279,9 @@ public class ScreenshotPlugin extends Plugin
} }
@Subscribe @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())); takeScreenshot("Death " + format(new Date()));
} }

9
runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
View File

@@ -53,7 +53,7 @@ import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
import net.runelite.api.events.GraphicChanged; import net.runelite.api.events.GraphicChanged;
import net.runelite.api.events.ItemContainerChanged; 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.MenuOptionClicked;
import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.VarbitChanged;
@@ -886,9 +886,12 @@ public class TimersPlugin extends Plugin
} }
@Subscribe @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) private TimerTimer createGameTimer(final GameTimer timer)