FatBoy/lakebane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Bugfix in forge contains

Browse Source
This commit is contained in:
MagicBot
2024-04-15 14:33:33 -04:00
parent b4824c69b8
commit a2484f94eb
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/ItemProductionMsgHandler.java
+1 -1
View File
@@ -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!
src/engine/objects/CharacterItemManager.java
-6
View File
@@ -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());