From 541958b630d513e76d0897ecab74b2edc1548e1b Mon Sep 17 00:00:00 2001 From: luisc Date: Sun, 12 Dec 2021 23:43:44 -0600 Subject: [PATCH] Fixed "world" keyword in for NPC scripting and API.getIWorld not returning the same instance. --- src/main/java/noppes/npcs/DataScript.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/DataScript.java b/src/main/java/noppes/npcs/DataScript.java index 29fb4be31..4522b5cfd 100644 --- a/src/main/java/noppes/npcs/DataScript.java +++ b/src/main/java/noppes/npcs/DataScript.java @@ -16,6 +16,7 @@ import noppes.npcs.controllers.IScriptHandler; import noppes.npcs.controllers.ScriptController; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.ScriptEvent; import noppes.npcs.scripted.entity.ScriptNpc; import noppes.npcs.scripted.ScriptWorld; @@ -50,7 +51,7 @@ public class DataScript implements IScriptHandler { if(npc instanceof EntityCustomNpc) dummyNpc = new ScriptNpc((EntityCustomNpc) npc); if(npc.worldObj instanceof WorldServer) - dummyWorld = new ScriptWorld((WorldServer) npc.worldObj); + dummyWorld = NpcAPI.Instance().getIWorld((WorldServer) npc.worldObj);//new ScriptWorld((WorldServer) npc.worldObj); } public void readFromNBT(NBTTagCompound compound) {