diff --git a/src/main/java/noppes/npcs/controllers/data/ForgeDataScript.java b/src/main/java/noppes/npcs/controllers/data/ForgeDataScript.java
index 21cf1f1e7..8514f9b00 100644
--- a/src/main/java/noppes/npcs/controllers/data/ForgeDataScript.java
+++ b/src/main/java/noppes/npcs/controllers/data/ForgeDataScript.java
@@ -58,8 +58,7 @@ public class ForgeDataScript implements IScriptHandler {
 
     public void callScript(String type, Event event) {
         if(this.isEnabled()) {
-            //CustomNpcs.getServer().func_152344_a(() -> {
-            Minecraft.getMinecraft().func_152344_a(() -> {
+            //Minecraft.getMinecraft().func_152344_a(() -> {
                 if (ScriptController.Instance.lastLoaded > this.lastInited) {
                     this.lastInited = ScriptController.Instance.lastLoaded;
                     if (!type.equals("init")) {
@@ -85,7 +84,7 @@ public class ForgeDataScript implements IScriptHandler {
 
                     script.run(type, event);
                 }
-            });
+            //});
         }
     }
 
diff --git a/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java b/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java
index ab4bba363..bd857e54c 100644
--- a/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java
+++ b/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java
@@ -49,7 +49,7 @@ public class WrapperNpcAPI extends NpcAPI {
 
     public IEntity getIEntity(Entity entity) {
         if (entity != null && !entity.worldObj.isRemote) {
-            return (IEntity)(entity instanceof EntityNPCInterface ? ((EntityNPCInterface)entity).wrappedNPC : WrapperEntityData.get(entity));
+            return (entity instanceof EntityNPCInterface ? ((EntityNPCInterface)entity).wrappedNPC : entity instanceof EntityPlayerMP ?  getIPlayer((EntityPlayerMP) entity) : WrapperEntityData.get(entity));
         } else {
             return null;
         }