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

Merge pull request #2038 from Owain94/1411-merge

Browse Source 
project: Merge upstream
This commit is contained in:
Ganom
2019-11-17 01:18:33 -05:00
committed by GitHub
parent 10f7a582f0 07fa478e67
commit 03a88f6c27
109 changed files with 639 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java
View File

@@ -37,7 +37,7 @@ import net.runelite.api.coords.WorldArea;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.AnimationChanged;
import net.runelite.api.events.HitsplatApplied;
import net.runelite.api.events.LocalPlayerDeath;
import net.runelite.api.events.PlayerDeath;
import net.runelite.api.events.PlayerDeath;
import net.runelite.api.events.SpotAnimationChanged;
import net.runelite.api.events.InteractingChanged;
@@ -248,14 +248,7 @@ public abstract class RSActorMixin implements RSActor
{
if (healthRatio == 0)
{
if (this == client.getLocalPlayer())
{
client.getLogger().debug("You died!");
LocalPlayerDeath event = LocalPlayerDeath.INSTANCE;
client.getCallbacks().post(LocalPlayerDeath.class, event);
}
else if (this != client.getLocalPlayer() && this instanceof Player)
if (this instanceof Player)
{
final PlayerDeath event = new PlayerDeath((Player) this);
client.getCallbacks().post(PlayerDeath.class, event);