From 14e7145503e9482eb084246873b675330d842340 Mon Sep 17 00:00:00 2001
From: AJ Ferguson <AJ-Ferguson@users.noreply.github.com>
Date: Sun, 14 Apr 2024 17:42:13 -0400
Subject: [PATCH] Reset attributes in JavaLoginTranslator

---
 .../geyser/entity/type/player/SessionPlayerEntity.java     | 7 +++++++
 .../translator/protocol/java/JavaLoginTranslator.java      | 2 +-
 .../translator/protocol/java/JavaRespawnTranslator.java    | 4 +---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/player/SessionPlayerEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/player/SessionPlayerEntity.java
index a41dac73e..32e0b3310 100644
--- a/core/src/main/java/org/geysermc/geyser/entity/type/player/SessionPlayerEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/player/SessionPlayerEntity.java
@@ -281,6 +281,13 @@ public class SessionPlayerEntity extends PlayerEntity {
         silent = false;
     }
 
+    public void resetAttributes() {
+        attributes.clear();
+        maxHealth = GeyserAttributeType.MAX_HEALTH.getDefaultValue();
+        // Relying on the server to resend speed attribute
+        // Armor attribute reset would go here
+    }
+
     public void resetAir() {
         this.setAirSupply(getMaxAir());
     }
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java
index 23c19e84f..4a15157f9 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java
@@ -71,7 +71,7 @@ public class JavaLoginTranslator extends PacketTranslator<ClientboundLoginPacket
             // Remove all bossbars
             session.getEntityCache().removeAllBossBars();
             // Remove extra hearts, hunger, etc.
-            entity.getAttributes().clear();
+            entity.resetAttributes();
             entity.resetMetadata();
 
             // Reset weather
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRespawnTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRespawnTranslator.java
index 40ec71100..d69077dcb 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRespawnTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRespawnTranslator.java
@@ -54,9 +54,7 @@ public class JavaRespawnTranslator extends PacketTranslator<ClientboundRespawnPa
         }
 
         if (!packet.isKeepAttributes()) {
-            entity.getAttributes().clear();
-            entity.setMaxHealth(GeyserAttributeType.MAX_HEALTH.getDefaultValue());
-            // Relying on the server to resend speed attribute
+            entity.resetAttributes();
         }
 
         session.setSpawned(false);