Don't store hashcode goal selector

CitizensDev · Jul 6, 2020 · ed14153 · ed14153
1 parent 002b2b6
commit ed14153
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -31,7 +31,6 @@
 import net.citizensnpcs.api.event.SpawnReason;
 import net.citizensnpcs.api.npc.AbstractNPC;
 import net.citizensnpcs.api.npc.BlockBreaker;
-import net.citizensnpcs.api.npc.MemoryNPCDataStore;
 import net.citizensnpcs.api.npc.BlockBreaker.BlockBreakerConfiguration;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.NPCRegistry;
@@ -55,8 +54,6 @@
 public class CitizensNPC extends AbstractNPC {
     private ChunkCoord cachedCoord;
     private EntityController entityController;
-    private final NPC nameHologram = null;
-    private final NPCRegistry registry = CitizensAPI.createAnonymousNPCRegistry(new MemoryNPCDataStore());
     private final CitizensNavigator navigator = new CitizensNavigator(this);
     private int updateCounter = 0;
 

diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
@@ -1433,7 +1433,7 @@ public static void clearGoals(NPC npc, PathfinderGoalSelector... goalSelectors)
             try {
                 Collection<?> list = (Collection<?>) GOAL_SET_FIELD.invoke(selector);
                 if (!list.isEmpty()) {
-                    npc.data().set("goal-selector-" + selector.hashCode(), Lists.newArrayList(list));
+                    npc.data().set("goal-selector", Lists.newArrayList(list));
                 }
                 list.clear();
             } catch (Exception e) {
@@ -1721,7 +1721,7 @@ public static void restoreGoals(NPC npc, PathfinderGoalSelector... goalSelectors
             try {
                 Collection<Object> list = (Collection<Object>) GOAL_SET_FIELD.invoke(selector);
                 list.clear();
-                Collection<Object> old = npc.data().get("goal-selector-" + selector.hashCode());
+                Collection<Object> old = npc.data().get("goal-selector");
                 if (old != null) {
                     list.addAll(old);
                 }

diff --git a/v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/util/NMSImpl.java b/v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/util/NMSImpl.java
@@ -1451,7 +1451,7 @@ public static void clearGoals(NPC npc, PathfinderGoalSelector... goalSelectors)
             try {
                 Collection<?> list = (Collection<?>) GOAL_SET_FIELD.invoke(selector);
                 if (!list.isEmpty()) {
-                    npc.data().set("goal-selector-" + selector.hashCode(), Lists.newArrayList(list));
+                    npc.data().set("goal-selector", Lists.newArrayList(list));
                 }
                 list.clear();
             } catch (Exception e) {
@@ -1676,7 +1676,8 @@ public static void restoreGoals(NPC npc, PathfinderGoalSelector... goalSelectors
             try {
                 Collection<Object> list = (Collection<Object>) GOAL_SET_FIELD.invoke(selector);
                 list.clear();
-                Collection<Object> old = npc.data().get("goal-selector-" + selector.hashCode());
+
+                Collection<Object> old = npc.data().get("goal-selector");
                 if (old != null) {
                     list.addAll(old);
                 }