From e4a953f1cc931c77cd8d8400a6e6e3ba1367faf3 Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Fri, 2 Jun 2023 23:13:36 -0500 Subject: [PATCH 1/2] Made NPC custom item update scripts also launch only every 10 ticks --- src/main/java/noppes/npcs/ScriptItemEventHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/ScriptItemEventHandler.java b/src/main/java/noppes/npcs/ScriptItemEventHandler.java index bd83aa1bf..1b17ba853 100644 --- a/src/main/java/noppes/npcs/ScriptItemEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptItemEventHandler.java @@ -26,7 +26,7 @@ public class ScriptItemEventHandler { @SubscribeEvent public void invoke(LivingEvent.LivingUpdateEvent event) { - if(event.entityLiving == null || event.entityLiving.worldObj == null || event.entityLiving instanceof EntityPlayer) + if(event.entityLiving == null || event.entityLiving.worldObj == null || event.entityLiving instanceof EntityPlayer || event.entityLiving.ticksExisted%10 != 0) return; if (event.entityLiving instanceof EntityCustomNpc) { From 069d9999bf339a7ad7c512d32a36c13eebc4368b Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Fri, 2 Jun 2023 23:21:14 -0500 Subject: [PATCH 2/2] Changed NPC custom item ticking to only happen for armors and weapons. --- src/main/java/noppes/npcs/ScriptItemEventHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/ScriptItemEventHandler.java b/src/main/java/noppes/npcs/ScriptItemEventHandler.java index 1b17ba853..c2014b23a 100644 --- a/src/main/java/noppes/npcs/ScriptItemEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptItemEventHandler.java @@ -31,9 +31,8 @@ public class ScriptItemEventHandler { if (event.entityLiving instanceof EntityCustomNpc) { HashMap armor = ((EntityCustomNpc) event.entityLiving).inventory.armor; - HashMap items = ((EntityCustomNpc) event.entityLiving).inventory.items; HashMap weapons = ((EntityCustomNpc) event.entityLiving).inventory.weapons; - HashMap[] inventories = new HashMap[]{armor, items, weapons}; + HashMap[] inventories = new HashMap[]{armor, weapons}; for (HashMap inventory : inventories) { for (ItemStack stack : inventory.values()) {