Skip to content
This repository has been archived by the owner on Apr 8, 2023. It is now read-only.

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

Merged
merged 1 commit into from
Nov 8, 2019
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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",
Expand Down Expand Up @@ -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;
}
}
}

Expand Down