From 3dc99dcf2cdc478b0cafe2ef36d90812273ac1a8 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 5 Jun 2023 13:06:25 -0400 Subject: [PATCH] REMVOEOMOWAMo Arggg LOUIS! --- src/main/java/noppes/npcs/scripted/NpcAPI.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index f991220db..f388863f2 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -73,7 +73,6 @@ public class NpcAPI extends AbstractNpcAPI { private static final Map worldCache = new LRUHashMap<>(10); private static final CacheHashMap> scriptItemCache = new CacheHashMap<>(60*1000); public static final HashMap engineObjects = new HashMap<>(); - public static final HashMap scriptPlayerCache = new HashMap<>(); public static final EventBus EVENT_BUS = new EventBus(); private static AbstractNpcAPI instance = null; @@ -196,16 +195,8 @@ public class NpcAPI extends AbstractNpcAPI { ScriptEntityData data = (ScriptEntityData) entity.getExtendedProperties("ScriptedObject"); if(data != null) return data.base; - if(entity instanceof EntityPlayerMP) { - if (!scriptPlayerCache.containsKey(entity.getPersistentID())) { - scriptPlayerCache.put(entity.getPersistentID(),new ScriptEntityData(new ScriptPlayer<>((EntityPlayerMP) entity))); - } - data = scriptPlayerCache.get(entity.getPersistentID()); - if(data == null){ - scriptPlayerCache.put(entity.getPersistentID(),new ScriptEntityData(new ScriptPlayer<>((EntityPlayerMP) entity))); - data = scriptPlayerCache.get(entity.getPersistentID()); - } - } + if(entity instanceof EntityPlayerMP) + data = new ScriptEntityData(new ScriptPlayer<>((EntityPlayerMP) entity)); else if(PixelmonHelper.isPixelmon(entity)) return new ScriptPixelmon((EntityTameable) entity); else if(entity instanceof EntityAnimal)