upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 04:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added scriptPlayerCache (no null pointers this time)

Browse Source
This commit is contained in:
Luis C.M committed 2023-06-04 11:02:59 -05:00
1 parent 59e1950c70
commit ad9c1b418d
1 file changed
+7 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/scripted/NpcAPI.java
+7 -2
View File
@@ -73,6 +73,7 @@ public class NpcAPI extends AbstractNpcAPI {
private static final Map<Integer, ScriptWorld> worldCache = new LRUHashMap<>(10);
private static final CacheHashMap<ItemStack, CacheHashMap.CachedObject<ScriptItemStack>> scriptItemCache = new CacheHashMap<>(60*1000);
public static final HashMap<String,Object> engineObjects = new HashMap<>();
public static final HashMap<UUID,ScriptEntityData> scriptPlayerCache = new HashMap<>();
public static final EventBus EVENT_BUS = new EventBus();
private static AbstractNpcAPI instance = null;
@@ -195,8 +196,12 @@ public class NpcAPI extends AbstractNpcAPI {
ScriptEntityData data = (ScriptEntityData) entity.getExtendedProperties("ScriptedObject");
if(data != null)
return data.base;
if(entity instanceof EntityPlayerMP)
data = new ScriptEntityData(new ScriptPlayer<>((EntityPlayerMP) entity));
if(entity instanceof EntityPlayerMP) {
if (!scriptPlayerCache.containsKey(entity.getPersistentID())) {
scriptPlayerCache.put(entity.getPersistentID(),new ScriptEntityData(new ScriptPlayer<>((EntityPlayerMP) entity)));
}
data = scriptPlayerCache.get(entity.getPersistentID());
}
else if(PixelmonHelper.isPixelmon(entity))
return new ScriptPixelmon<EntityTameable>((EntityTameable) entity);
else if(entity instanceof EntityAnimal)