Only play totem animation for dying player in 1.11->1.10 (#860)

ViaVersion · Aug 14, 2024 · 9c3255d · 9c3255d
1 parent b03be8e
commit 9c3255d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java
@@ -83,7 +83,10 @@ public void register() {
                 handler(wrapper -> {
                     ClientWorld clientChunks = wrapper.user().get(ClientWorld.class);
                     clientChunks.setEnvironment(wrapper.get(Types.INT, 1));
-                    addTrackedEntity(wrapper, wrapper.get(Types.INT, 0), playerType);
+
+                    final int entityId = wrapper.get(Types.INT, 0);
+                    addTrackedEntity(wrapper, entityId, playerType);
+                    tracker(wrapper.user()).setClientEntityId(entityId);
                 });
             }
         });

diff --git a/...a/com/viaversion/viabackwards/protocol/v1_11to1_10/rewriter/EntityPacketRewriter1_11.java b/...a/com/viaversion/viabackwards/protocol/v1_11to1_10/rewriter/EntityPacketRewriter1_11.java
@@ -159,9 +159,15 @@ public void register() {
                 map(Types.BYTE); // 1 - Entity Status
 
                 handler(wrapper -> {
-                    byte b = wrapper.get(Types.BYTE, 0);
+                    final int entityId = wrapper.get(Types.INT, 0);
+                    if (entityId != tracker(wrapper.user()).clientEntityId()) {
+                        // Entity events are sent for all players, but we only want to apply this for the self player
+                        return;
+                    }
 
-                    if (b == 35) {
+                    final byte entityStatus = wrapper.get(Types.BYTE, 0);
+                    if (entityStatus == 35) {
+                        // TODO spawn particles?
                         wrapper.clearPacket();
                         wrapper.setPacketType(ClientboundPackets1_9_3.GAME_EVENT);
                         wrapper.write(Types.UNSIGNED_BYTE, (short) 10); // Play Elder Guardian animation