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

Merge branch 'master' into better-script-info

Browse Source 
# Conflicts:
#	runelite-client/src/main/resources/scripts/ChatboxInputWidgetBuilder.rs2asm
#	runelite-client/src/main/resources/scripts/OptionsPanelRebuilder.rs2asm
#	runelite-client/src/main/resources/scripts/SpecbarRedraw.rs2asm
#	runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash
#	runelite-client/src/main/scripts/OptionsPanelRebuilder.hash
#	runelite-client/src/main/scripts/SpecbarRedraw.hash
This commit is contained in:
therealunull
2020-10-29 13:23:04 -04:00
parent c626769ca4 0b13503b1d
commit 1eab6b46cd
36 changed files with 603 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
}

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

@@ -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()