Merge branch 'master' of https://github.com/runelite/runelite into runelite-master

2019-06-21 03:32:14 -04:00
parent 711e6c1a82 9620a4fce6
commit 1f5ac7a86a
72 changed files with 2852 additions and 491 deletions
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
@@ -1268,13 +1268,6 @@ public abstract class RSClientMixin implements RSClient
 		client.getCallbacks().post(new UsernameChanged());
 	}

-	@Inject
-	@Override
-	public void setHealthBarOverride(HealthBarOverride override)
-	{
-		healthBarOverride = override;
-	}
-
 	@Override
 	@Inject
 	public int getTickCount()
@@ -1565,4 +1558,12 @@ public abstract class RSClientMixin implements RSClient
 		enumCache.put(id, rsEnumDefinition);
 		return rsEnumDefinition;
 	}
+
+	@Inject
+	@Override
+	public void resetHealthBarCaches()
+	{
+		getHealthBarCache().reset();
+		getHealthBarSpriteCache().reset();
+	}
 }