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

2020-10-29 17:16:01 +01:00
parent 2946f1f472 2dafade4d1
commit 0677ccdda4
33 changed files with 643 additions and 184 deletions
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java
@@ -182,4 +182,6 @@ public interface RSActor extends RSEntity, Actor
 	@Import("runSequence")
 	@Override
 	int getRunAnimation();
+
+	void setDead(boolean dead);
 }
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNPC.java
@@ -13,6 +13,4 @@ public interface RSNPC extends RSActor, NPC
 	int getIndex();

 	void setIndex(int id);
-
-	void setDead(boolean dead);
 }