From 493d60c91e7a8696351a40325e7faf8047e9bd39 Mon Sep 17 00:00:00 2001
From: Ganom <theariall@gmail.com>
Date: Thu, 7 Nov 2019 20:24:47 -0500
Subject: [PATCH] itemcharge: temp fix for ugly broken recoil code.

---
 .../plugins/itemcharges/ItemChargePlugin.java | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
index 9e6f412ff9..70796730bc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
@@ -44,14 +44,16 @@
 import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;
 import net.runelite.api.ItemID;
+import static net.runelite.api.ItemID.RING_OF_RECOIL;
 import net.runelite.api.Varbits;
 import net.runelite.api.events.ChatMessage;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
-import net.runelite.api.events.SpotAnimationChanged;
 import net.runelite.api.events.ItemContainerChanged;
 import net.runelite.api.events.ScriptCallbackEvent;
+import net.runelite.api.events.SpotAnimationChanged;
 import net.runelite.api.events.VarbitChanged;
+import net.runelite.api.util.Text;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.Notifier;
@@ -62,9 +64,6 @@
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.ui.overlay.OverlayManager;
 import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
-import net.runelite.api.util.Text;
-
-import static net.runelite.api.ItemID.RING_OF_RECOIL;
 
 @PluginDescriptor(
 	name = "Item Charges",
@@ -561,27 +560,25 @@ else if (braceletText.contains("expeditious bracelet"))
 		ringOfRecoilAvailable = false;
 		ringOfRecoilEquipped = false;
 
-		Item ring = null;
-		if (equipment != null && equipment.getItems().length >= EquipmentInventorySlot.RING.getSlotIdx())
-		{
-			ring = equipment.getItems()[EquipmentInventorySlot.RING.getSlotIdx()];
-		}
-		if (ring != null && ring.getId() == RING_OF_RECOIL)
-		{
-			ringOfRecoilEquipped = true;
-			ringOfRecoilAvailable = true;
-		}
-		Item[] items = new Item[0];
-		if (inventory != null)
+		if (equipment != null && inventory != null)
 		{
-			items = inventory.getItems();
-		}
-		for (Item item : items)
-		{
-			if (item.getId() == RING_OF_RECOIL)
+			for (Item item : equipment.getItems())
 			{
-				ringOfRecoilAvailable = true;
-				break;
+				if (item.getId() == RING_OF_RECOIL)
+				{
+					ringOfRecoilEquipped = true;
+					ringOfRecoilAvailable = true;
+					break;
+				}
+			}
+
+			for (Item item : inventory.getItems())
+			{
+				if (item.getId() == RING_OF_RECOIL)
+				{
+					ringOfRecoilAvailable = true;
+					break;
+				}
 			}
 		}