Fix Multithreaded Tracker (#236)

Winds-Studio · Feb 22, 2025 · 8a7645e · 8a7645e
1 parent ab0e8da
commit 8a7645e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/leaf-server/minecraft-patches/features/0085-Multithreaded-Tracker.patch b/leaf-server/minecraft-patches/features/0085-Multithreaded-Tracker.patch
@@ -177,7 +177,7 @@ index f106373ef3ac4a8685c2939c9e8361688a285913..51ae390c68e7a3aa193329cc3bc47ca6
      public boolean visible = true;
 
 diff --git a/net/minecraft/server/level/ServerEntity.java b/net/minecraft/server/level/ServerEntity.java
-index d8298c7925e3bcea07ead4d438478cc51abcfa16..75670751064add901c2628d53d8028350f966c5d 100644
+index d8298c7925e3bcea07ead4d438478cc51abcfa16..2b559cb1cfd0d3a729a2b14f197880fe4af8cb92 100644
 --- a/net/minecraft/server/level/ServerEntity.java
 +++ b/net/minecraft/server/level/ServerEntity.java
 @@ -110,8 +110,16 @@ public class ServerEntity {
@@ -199,7 +199,26 @@ index d8298c7925e3bcea07ead4d438478cc51abcfa16..75670751064add901c2628d53d802835
                          }
                      }
                  );
-@@ -435,12 +443,15 @@ public class ServerEntity {
+@@ -376,6 +384,8 @@ public class ServerEntity {
+         }
+
+         if (this.entity instanceof LivingEntity livingEntity) {
++            // Leaf start - Multithreaded tracker
++            Runnable runnable = () -> {
+             List<Pair<EquipmentSlot, ItemStack>> list = Lists.newArrayList();
+
+             for (EquipmentSlot equipmentSlot : EquipmentSlot.VALUES) {
+@@ -389,6 +399,9 @@ public class ServerEntity {
+                 consumer.accept(new ClientboundSetEquipmentPacket(this.entity.getId(), list, true)); // Paper - data sanitization
+             }
+             ((LivingEntity) this.entity).detectEquipmentUpdatesPublic(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending
++            };
++            if (org.dreeam.leaf.config.modules.async.MultithreadedTracker.enabled && Thread.currentThread() instanceof org.dreeam.leaf.async.tracker.MultithreadedTracker.MultithreadedTrackerThread) net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(runnable); else runnable.run();
++            // Leaf end - Multithreaded tracker
+         }
+
+         if (!this.entity.getPassengers().isEmpty()) {
+@@ -435,12 +448,15 @@ public class ServerEntity {
          if (this.entity instanceof LivingEntity) {
              Set<AttributeInstance> attributesToSync = ((LivingEntity)this.entity).getAttributes().getAttributesToSync();
              if (!attributesToSync.isEmpty()) {

diff --git a/leaf-server/src/main/java/org/dreeam/leaf/util/map/StringCanonizingOpenHashMap.java b/leaf-server/src/main/java/org/dreeam/leaf/util/map/StringCanonizingOpenHashMap.java
@@ -1,5 +1,6 @@
 package org.dreeam.leaf.util.map;
 
+import com.google.common.collect.Interner;
 import com.google.common.collect.Interners;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
@@ -9,11 +10,12 @@
 
 public class StringCanonizingOpenHashMap<T> extends Object2ObjectOpenHashMap<String, T> {
 
-    private static final com.google.common.collect.Interner<String> KEY_INTERNER = Interners.newWeakInterner();
+    private static final Interner<String> KEY_INTERNER = Interners.newWeakInterner();
 
     private static String intern(String key) {
         return key != null ? KEY_INTERNER.intern(key) : null;
     }
+
     public StringCanonizingOpenHashMap() {
         super();
     }