Merge remote-tracking branch 'runelite/master' into master

runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java

@@ -55,7 +55,6 @@ import net.runelite.rs.api.RSHealthBar;
 import net.runelite.rs.api.RSHealthBarDefinition;
 import net.runelite.rs.api.RSHealthBarUpdate;
 import net.runelite.rs.api.RSIterableNodeDeque;
-import net.runelite.rs.api.RSNPC;
 import net.runelite.rs.api.RSNode;
 
 @Mixin(RSActor.class)
@@ -64,6 +63,9 @@ public abstract class RSActorMixin implements RSActor
 	@Shadow("client")
 	private static RSClient client;
 
+	@Inject
+	private boolean dead;
+
 	@Inject
 	@Override
 	public Actor getInteracting()
@@ -241,6 +243,20 @@ public abstract class RSActorMixin implements RSActor
 		return new WorldArea(this.getWorldLocation(), size, size);
 	}
 
+	@Inject
+	@Override
+	public boolean isDead()
+	{
+		return dead;
+	}
+
+	@Inject
+	@Override
+	public void setDead(boolean dead)
+	{
+		this.dead = dead;
+	}
+
 	@Inject
 	@MethodHook("addHealthBar")
 	public void setCombatInfo(int combatInfoId, int gameCycle, int var3, int var4, int healthRatio, int health)
@@ -250,10 +266,7 @@ public abstract class RSActorMixin implements RSActor
 			final ActorDeath event = new ActorDeath(this);
 			client.getCallbacks().post(ActorDeath.class, event);
 
-			if (this instanceof RSNPC)
-			{
-				((RSNPC) this).setDead(true);
-			}
+			this.setDead(true);
 		}
 	}
 

runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java

@@ -51,9 +51,6 @@ public abstract class RSNPCMixin implements RSNPC
 	@Inject
 	private int npcIndex;
 
-	@Inject
-	private boolean dead;
-
 	@Inject
 	@Override
 	public int getId()
@@ -161,20 +158,6 @@ public abstract class RSNPCMixin implements RSNPC
 		return composition;
 	}
 
-	@Inject
-	@Override
-	public boolean isDead()
-	{
-		return dead;
-	}
-
-	@Inject
-	@Override
-	public void setDead(boolean dead)
-	{
-		this.dead = dead;
-	}
-
 	@Inject
 	@Override
 	public Shape getConvexHull()