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

# Conflicts:
#	runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java
This commit is contained in:
James Munson
2019-04-25 22:29:47 -07:00

View File

@@ -134,7 +134,7 @@ public class AmmoPlugin extends Plugin
return;
}
infoBoxManager.removeInfoBox(counterBox);
removeInfobox();
final BufferedImage image = itemManager.getImage(item.getId(), 5, false);
counterBox = new AmmoCounter(this, item.getId(), item.getQuantity(), comp.getName(), image);
infoBoxManager.addInfoBox(counterBox);