Merge remote-tracking branch 'runelite/master'

This commit is contained in:
Owain van Brakel
2020-05-01 10:27:06 +02:00
9 changed files with 143 additions and 11 deletions

View File

@@ -114,7 +114,7 @@ public abstract class RSActorMixin implements RSActor
@Inject
@Override
public int getHealth()
public int getHealthScale()
{
RSIterableNodeDeque healthBars = getHealthBars();
if (healthBars != null)