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

itemcharge: temp fix for ugly broken recoil code. (#1947)

Browse Source 
itemcharge: temp fix for ugly broken recoil code.
This commit is contained in:
Owain van Brakel
2019-11-08 05:00:14 +01:00
committed by GitHub
parent a7777b6cf7 493d60c91e
commit 4e3b1ba8bb
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
View File

@@ -44,14 +44,16 @@ import net.runelite.api.InventoryID;
import net.runelite.api.Item; import net.runelite.api.Item;
import net.runelite.api.ItemContainer; import net.runelite.api.ItemContainer;
import net.runelite.api.ItemID; import net.runelite.api.ItemID;
import static net.runelite.api.ItemID.RING_OF_RECOIL;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
import net.runelite.api.events.SpotAnimationChanged;
import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.ItemContainerChanged;
import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.events.ScriptCallbackEvent;
import net.runelite.api.events.SpotAnimationChanged;
import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.VarbitChanged;
import net.runelite.api.util.Text;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.Notifier; import net.runelite.client.Notifier;
@@ -62,9 +64,6 @@ import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
import net.runelite.api.util.Text;
import static net.runelite.api.ItemID.RING_OF_RECOIL;
@PluginDescriptor( @PluginDescriptor(
name = "Item Charges", name = "Item Charges",
@@ -561,27 +560,25 @@ public class ItemChargePlugin extends Plugin
ringOfRecoilAvailable = false; ringOfRecoilAvailable = false;
ringOfRecoilEquipped = false; ringOfRecoilEquipped = false;
Item ring = null; if (equipment != null && inventory != null)
if (equipment != null && equipment.getItems().length >= EquipmentInventorySlot.RING.getSlotIdx())
{ {
ring = equipment.getItems()[EquipmentInventorySlot.RING.getSlotIdx()]; for (Item item : equipment.getItems())
}
if (ring != null && ring.getId() == RING_OF_RECOIL)
{
ringOfRecoilEquipped = true;
ringOfRecoilAvailable = true;
}
Item[] items = new Item[0];
if (inventory != null)
{
items = inventory.getItems();
}
for (Item item : items)
{
if (item.getId() == RING_OF_RECOIL)
{ {
ringOfRecoilAvailable = true; if (item.getId() == RING_OF_RECOIL)
break; {
ringOfRecoilEquipped = true;
ringOfRecoilAvailable = true;
break;
}
}
for (Item item : inventory.getItems())
{
if (item.getId() == RING_OF_RECOIL)
{
ringOfRecoilAvailable = true;
break;
}
} }
} }