Merge branch 'server-renderer' into 1.20.4

NiFeather · Jan 15, 2024 · 670fb8a · 670fb8a
2 parents 2cf3f14 + c699c3a
commit 670fb8a
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/...orph/backends/server/renderer/network/datawatcher/watchers/types/LivingEntityWatcher.java b/...orph/backends/server/renderer/network/datawatcher/watchers/types/LivingEntityWatcher.java
@@ -1,5 +1,6 @@
 package xiamomc.morph.backends.server.renderer.network.datawatcher.watchers.types;
 
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.core.BlockPos;
@@ -36,11 +37,18 @@ protected void initRegistry()
         register(ValueIndex.BASE_LIVING);
     }
 
-    private final Map<Player, EquipmentSlot> handMap = new Object2ObjectOpenHashMap<>();
+    private Map<Player, EquipmentSlot> handMap;
+
+    private void ensureHandMapPresent()
+    {
+        if (handMap == null)
+            handMap = new Object2ObjectArrayMap<>();
+    }
 
     @EventHandler
     public void onPlayerStartUsingItem(PlayerInteractEvent e)
     {
+        ensureHandMapPresent();
         handMap.put(e.getPlayer(), e.getHand());
     }
 
@@ -59,6 +67,8 @@ protected void doSync()
         {
             flagBit |= 0x01;
 
+            ensureHandMapPresent();
+
             var handInUse = handMap.remove(player);
 
             if (handInUse == null)