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

project(mixins): Fix setCombatInfo

Browse Source
This commit is contained in:
Owain van Brakel
2022-06-27 12:42:12 +02:00
parent bf1a6c6200
commit 5e37d4765e
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ import net.runelite.api.Actor;
import net.runelite.api.Hitsplat; import net.runelite.api.Hitsplat;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.NPCComposition; import net.runelite.api.NPCComposition;
import net.runelite.api.NpcID;
import net.runelite.api.Perspective; import net.runelite.api.Perspective;
import net.runelite.api.Player; import net.runelite.api.Player;
import net.runelite.api.Point; import net.runelite.api.Point;
@@ -68,7 +69,7 @@ public abstract class RSActorMixin implements RSActor
private static RSClient client; private static RSClient client;
@Inject @Inject
private final Set<Integer> combatInfoFilter = ImmutableSet.of(0, 2, 16, 17, 18, 19, 20, 21, 22); private static final Set<Integer> combatInfoFilter = ImmutableSet.of(0, 2, 16, 17, 18, 19, 20, 21, 22);
@Inject @Inject
private boolean dead; private boolean dead;
@@ -195,6 +196,16 @@ public abstract class RSActorMixin implements RSActor
@Inject @Inject
public void animationChanged(int idx) public void animationChanged(int idx)
{ {
if (this instanceof RSNPC)
{
int id = ((RSNPC) this).getId();
if (id == NpcID.CORPOREAL_BEAST && this.getAnimation() == 1676)
{
setDead(true);
}
}
AnimationChanged animationChange = new AnimationChanged(); AnimationChanged animationChange = new AnimationChanged();
animationChange.setActor(this); animationChange.setActor(this);
client.getCallbacks().post(animationChange); client.getCallbacks().post(animationChange);
@@ -273,7 +284,7 @@ public abstract class RSActorMixin implements RSActor
if (healthRatio == 0) if (healthRatio == 0)
{ {
if (!isDead()) if (isDead())
{ {
return; return;
} }
@@ -290,7 +301,7 @@ public abstract class RSActorMixin implements RSActor
} }
else if (healthRatio > 0) else if (healthRatio > 0)
{ {
if (this instanceof RSNPC && ((RSNPC) this).getId() == 319 && isDead()) if (this instanceof RSNPC && ((RSNPC) this).getId() == NpcID.CORPOREAL_BEAST && isDead())
{ {
return; return;
} }