From f5ee7451f5c539c64d6e4f216b1adb4f5025c0e3 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 3 Mar 2025 18:25:29 -0500 Subject: [PATCH] Fix Cached Item and Scripted Item Errors --- .../packets/request/script/item/ItemScriptPacket.java | 1 + src/main/java/noppes/npcs/scripted/NpcAPI.java | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/item/ItemScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/item/ItemScriptPacket.java index aa60d90b1..67aaa5e1e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/item/ItemScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/item/ItemScriptPacket.java @@ -84,6 +84,7 @@ public final class ItemScriptPacket extends AbstractPacket { wrapper.setMCNbt(compound); wrapper.saveScriptData(); wrapper.loaded = false; + wrapper.errored.clear(); wrapper.lastInited = -1; ((EntityPlayerMP) player).sendContainerToPlayer(player.inventoryContainer); } diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 747bff40a..30d410713 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -493,15 +493,8 @@ public class NpcAPI extends AbstractNpcAPI { } else { scriptStack = new ScriptItemStack(itemstack); } + scriptItemCache.put(itemstack, new CacheHashMap.CachedObject<>(scriptStack)); } - - // Version Check Linked Item -// if(scriptStack instanceof ScriptLinkedItem && CustomNpcs.side() == Side.SERVER){ -// ScriptLinkedItem scriptLinkedItem = (ScriptLinkedItem) scriptStack; -// LinkedItem linkedItem = LinkedItemController.getInstance().get(scriptLinkedItem.linkedItem.getId()); -// -// -// } return scriptStack; } }