From 59e1950c7042d34739971c08cd56a37ae70bb760 Mon Sep 17 00:00:00 2001 From: Kam Date: Sat, 3 Jun 2023 23:07:48 -0400 Subject: [PATCH] Remove PlayerScript Cache --- src/main/java/noppes/npcs/scripted/NpcAPI.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 57234cc5a..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 playerCache = new HashMap<>(); public static final EventBus EVENT_BUS = new EventBus(); private static AbstractNpcAPI instance = null; @@ -196,12 +195,8 @@ public class NpcAPI extends AbstractNpcAPI { ScriptEntityData data = (ScriptEntityData) entity.getExtendedProperties("ScriptedObject"); if(data != null) return data.base; - if(entity instanceof EntityPlayerMP) { - if (!playerCache.containsKey(((EntityPlayerMP) entity).getDisplayName())) { - playerCache.put(((EntityPlayerMP) entity).getDisplayName(),new ScriptEntityData(new ScriptPlayer<>((EntityPlayerMP) entity))); - } - data = playerCache.get(((EntityPlayerMP) entity).getDisplayName()); - } + 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)