Fix citizens compatibility

Wind-Development · Sep 16, 2023 · ee3449a · ee3449a
1 parent f749dff
commit ee3449a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/...ot-Server/src/main/java/ga/windpvp/windspigot/async/entitytracker/AsyncEntityTracker.java b/...ot-Server/src/main/java/ga/windpvp/windspigot/async/entitytracker/AsyncEntityTracker.java
@@ -6,7 +6,9 @@
 
 import ga.windpvp.windspigot.async.AsyncUtil;
 import ga.windpvp.windspigot.config.WindSpigotConfig;
+import me.rastrian.dev.utils.IndexedLinkedHashSet;
 import net.minecraft.server.EntityTracker;
+import net.minecraft.server.EntityTrackerEntry;
 import net.minecraft.server.WorldServer;
 
 public class AsyncEntityTracker extends EntityTracker {
@@ -28,7 +30,7 @@ public void updatePlayers() {
 
 			AsyncUtil.run(() -> {
 				for (int index = finalOffset; index < c.size(); index += WindSpigotConfig.trackingThreads) {
-					c.get(index).update();
+					((IndexedLinkedHashSet<EntityTrackerEntry>) c).get(index).update();
 				}
 				worldServer.ticker.getLatch().decrement();
 

diff --git a/...r/src/main/java/ga/windpvp/windspigot/async/entitytracker/MultithreadedEntityTracker.java b/...r/src/main/java/ga/windpvp/windspigot/async/entitytracker/MultithreadedEntityTracker.java
@@ -6,7 +6,9 @@
 
 import ga.windpvp.windspigot.async.AsyncUtil;
 import ga.windpvp.windspigot.config.WindSpigotConfig;
+import me.rastrian.dev.utils.IndexedLinkedHashSet;
 import net.minecraft.server.EntityTracker;
+import net.minecraft.server.EntityTrackerEntry;
 import net.minecraft.server.WorldServer;
 
 public class MultithreadedEntityTracker extends EntityTracker {
@@ -28,7 +30,7 @@ public void updatePlayers() {
 
 			AsyncUtil.run(() -> {
 				for (int index = finalOffset; index < c.size(); index += WindSpigotConfig.trackingThreads) {
-					c.get(index).update();
+                    ((IndexedLinkedHashSet<EntityTrackerEntry>) c).get(index).update();
 				}
 				worldServer.ticker.getLatch().decrement();
 

diff --git a/WindSpigot-Server/src/main/java/net/minecraft/server/EntityTracker.java b/WindSpigot-Server/src/main/java/net/minecraft/server/EntityTracker.java
@@ -1,14 +1,17 @@
 package net.minecraft.server;
 
 import java.util.List;
+import java.util.Set;
+
 import com.google.common.collect.Lists;
 
 import ga.windpvp.windspigot.commons.ConcurrentIntHashMap;
 import ga.windpvp.windspigot.config.WindSpigotConfig;
+import me.rastrian.dev.utils.IndexedLinkedHashSet;
 
 public class EntityTracker {
 
-	public List<EntityTrackerEntry> c = Lists.newCopyOnWriteArrayList();
+	public Set<EntityTrackerEntry> c = new IndexedLinkedHashSet<>();
 
 	public IntHashMap<EntityTrackerEntry> trackedEntities = new ConcurrentIntHashMap<>(); // WindSpigot