From d89b55e9ac4549f3c7146d841200e9deb801f694 Mon Sep 17 00:00:00 2001
From: Konicai <71294714+Konicai@users.noreply.github.com>
Date: Mon, 31 Jul 2023 16:56:28 -0400
Subject: [PATCH] Ignore invalid animations in ClientboundAnimatePacket (#4025)

---
 .../protocol/java/entity/JavaAnimateTranslator.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaAnimateTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaAnimateTranslator.java
index f82c33032..7df6b710c 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaAnimateTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaAnimateTranslator.java
@@ -25,6 +25,7 @@
 
 package org.geysermc.geyser.translator.protocol.java.entity;
 
+import com.github.steveice10.mc.protocol.data.game.entity.player.Animation;
 import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundAnimatePacket;
 import org.cloudburstmc.math.vector.Vector3f;
 import org.cloudburstmc.protocol.bedrock.packet.AnimateEntityPacket;
@@ -44,12 +45,17 @@ public class JavaAnimateTranslator extends PacketTranslator<ClientboundAnimatePa
     @Override
     public void translate(GeyserSession session, ClientboundAnimatePacket packet) {
         Entity entity = session.getEntityCache().getEntityByJavaId(packet.getEntityId());
-        if (entity == null)
+        if (entity == null) {
             return;
+        }
+        Animation animation = packet.getAnimation();
+        if (animation == null) {
+            return;
+        }
 
         AnimatePacket animatePacket = new AnimatePacket();
         animatePacket.setRuntimeEntityId(entity.getGeyserId());
-        switch (packet.getAnimation()) {
+        switch (animation) {
             case SWING_ARM:
                 animatePacket.setAction(AnimatePacket.Action.SWING_ARM);
                 if (entity.getEntityId() == session.getPlayerEntity().getEntityId()) {
@@ -86,7 +92,7 @@ public class JavaAnimateTranslator extends PacketTranslator<ClientboundAnimatePa
                 animatePacket.setAction(AnimatePacket.Action.WAKE_UP);
                 break;
             default:
-                // Unknown Animation
+                session.getGeyser().getLogger().debug("Unhandled java animation: " + animation);
                 return;
         }