Browse Source

Bugfix in forge contains

combat-2
MagicBot 8 months ago
parent
commit
a2484f94eb
  1. 2
      src/engine/net/client/handlers/ItemProductionMsgHandler.java
  2. 6
      src/engine/objects/CharacterItemManager.java

2
src/engine/net/client/handlers/ItemProductionMsgHandler.java

@ -350,7 +350,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
if (targetItem == null) if (targetItem == null)
return; return;
if (!vendor.charItemManager.forgeContains(targetItem, vendor)) if (!ForgeManager.vendorItemLookup.get(vendor).contains(targetItem))
return; return;
// Cannot junk items without a forge! // Cannot junk items without a forge!

6
src/engine/objects/CharacterItemManager.java

@ -1353,12 +1353,6 @@ public class CharacterItemManager {
return inventory.contains(item); return inventory.contains(item);
} }
public synchronized boolean forgeContains(Item item, NPC vendor) {
if (item.template.item_type.equals(ItemType.GOLD))
return (this.getGoldInventory() != null && this.goldInventory.getObjectUUID() == item.getObjectUUID());
return ForgeManager.vendorItemLookup.get(vendor).contains(item);
}
public synchronized boolean vaultContains(Item item) { public synchronized boolean vaultContains(Item item) {
if (item.template.item_type.equals(ItemType.GOLD)) if (item.template.item_type.equals(ItemType.GOLD))
return (this.getGoldVault() != null && this.goldVault.getObjectUUID() == item.getObjectUUID()); return (this.getGoldVault() != null && this.goldVault.getObjectUUID() == item.getObjectUUID());

Loading…
Cancel
Save