Prevents item swap when running player animation.

toxicity188 · Dec 28, 2024 · 8abdb8e · 8abdb8e
1 parent f03aaf5
commit 8abdb8e
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 0 deletions.
diff --git a/api/src/main/java/kr/toxicity/model/api/tracker/PlayerTracker.java b/api/src/main/java/kr/toxicity/model/api/tracker/PlayerTracker.java
@@ -7,13 +7,22 @@
 
 public final class PlayerTracker extends EntityTracker {
 
+    private final Player player;
+
     public PlayerTracker(@NotNull Player entity, @NotNull RenderInstance instance) {
         super(entity, instance);
+        this.player = entity;
         instance.filter(p -> BetterModel.inst().playerManager().player(p).showPlayerLimb());
     }
 
     @Override
     public boolean isRunningSingleAnimation() {
         return false;
     }
+
+    @Override
+    public void close() throws Exception {
+        super.close();
+        player.updateInventory();
+    }
 }
diff --git a/nms/v1_20_R3/src/main/kotlin/kr/toxicity/model/nms/v1_20_R3/NMSImpl.kt b/nms/v1_20_R3/src/main/kotlin/kr/toxicity/model/nms/v1_20_R3/NMSImpl.kt
@@ -209,6 +209,21 @@ class NMSImpl : NMS {
             super.write(ctx, msg, promise)
         }
 
+        override fun channelRead(ctx: ChannelHandlerContext, msg: Any) {
+            when (msg) {
+                is ServerboundSetCarriedItemPacket -> {
+                    if (connection.player.id.toTracker() != null) {
+                        connection.send(ClientboundSetCarriedItemPacket(player.inventory.heldItemSlot))
+                        return
+                    }
+                }
+                is ServerboundPlayerActionPacket -> {
+                    if (connection.player.id.toTracker() != null) return
+                }
+            }
+            super.channelRead(ctx, msg)
+        }
+
         private fun EntityTracker.remove() {
             entityUUIDMap.remove(uuid())
             remove(player)

diff --git a/nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/NMSImpl.kt b/nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/NMSImpl.kt
@@ -196,6 +196,21 @@ class NMSImpl : NMS {
             super.write(ctx, msg, promise)
         }
 
+        override fun channelRead(ctx: ChannelHandlerContext, msg: Any) {
+            when (msg) {
+                is ServerboundSetCarriedItemPacket -> {
+                    if (connection.player.id.toTracker() != null) {
+                        connection.send(ClientboundSetCarriedItemPacket(player.inventory.heldItemSlot))
+                        return
+                    }
+                }
+                is ServerboundPlayerActionPacket -> {
+                    if (connection.player.id.toTracker() != null) return
+                }
+            }
+            super.channelRead(ctx, msg)
+        }
+
         private fun EntityTracker.remove() {
             entityUUIDMap.remove(uuid())
             remove(player)

diff --git a/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/nms/v1_21_R1/NMSImpl.kt b/nms/v1_21_R1/src/main/kotlin/kr/toxicity/model/nms/v1_21_R1/NMSImpl.kt
@@ -199,6 +199,21 @@ class NMSImpl : NMS {
             super.write(ctx, msg, promise)
         }
 
+        override fun channelRead(ctx: ChannelHandlerContext, msg: Any) {
+            when (msg) {
+                is ServerboundSetCarriedItemPacket -> {
+                    if (connection.player.id.toTracker() != null) {
+                        connection.send(ClientboundSetCarriedItemPacket(player.inventory.heldItemSlot))
+                        return
+                    }
+                }
+                is ServerboundPlayerActionPacket -> {
+                    if (connection.player.id.toTracker() != null) return
+                }
+            }
+            super.channelRead(ctx, msg)
+        }
+
         private fun EntityTracker.remove() {
             entityUUIDMap.remove(uuid())
             remove(player)

diff --git a/nms/v1_21_R2/src/main/kotlin/kr/toxicity/model/nms/v1_21_R2/NMSImpl.kt b/nms/v1_21_R2/src/main/kotlin/kr/toxicity/model/nms/v1_21_R2/NMSImpl.kt
@@ -197,6 +197,21 @@ class NMSImpl : NMS {
             super.write(ctx, msg, promise)
         }
 
+        override fun channelRead(ctx: ChannelHandlerContext, msg: Any) {
+            when (msg) {
+                is ServerboundSetCarriedItemPacket -> {
+                    if (connection.player.id.toTracker() != null) {
+                        connection.send(ClientboundSetHeldSlotPacket(player.inventory.heldItemSlot))
+                        return
+                    }
+                }
+                is ServerboundPlayerActionPacket -> {
+                    if (connection.player.id.toTracker() != null) return
+                }
+            }
+            super.channelRead(ctx, msg)
+        }
+
         private fun EntityTracker.remove() {
             entityUUIDMap.remove(uuid())
             remove(player)

diff --git a/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/nms/v1_21_R3/NMSImpl.kt b/nms/v1_21_R3/src/main/kotlin/kr/toxicity/model/nms/v1_21_R3/NMSImpl.kt
@@ -199,6 +199,21 @@ class NMSImpl : NMS {
             super.write(ctx, msg, promise)
         }
 
+        override fun channelRead(ctx: ChannelHandlerContext, msg: Any) {
+            when (msg) {
+                is ServerboundSetCarriedItemPacket -> {
+                    if (connection.player.id.toTracker() != null) {
+                        connection.send(ClientboundSetHeldSlotPacket(player.inventory.heldItemSlot))
+                        return
+                    }
+                }
+                is ServerboundPlayerActionPacket -> {
+                    if (connection.player.id.toTracker() != null) return
+                }
+            }
+            super.channelRead(ctx, msg)
+        }
+
         private fun EntityTracker.remove() {
             entityUUIDMap.remove(uuid())
             remove(player)