From ed21a10101c42ebdcae75517cbf99e6f78534525 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Tue, 9 May 2023 01:41:57 -0400
Subject: [PATCH] Boss bars should actually be more reliable on dimension
 switch

---
 .../org/geysermc/geyser/session/cache/EntityCache.java    | 8 --------
 .../bedrock/entity/player/BedrockActionTranslator.java    | 5 +++--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/EntityCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/EntityCache.java
index d4e45cdae..9dc89215a 100644
--- a/core/src/main/java/org/geysermc/geyser/session/cache/EntityCache.java
+++ b/core/src/main/java/org/geysermc/geyser/session/cache/EntityCache.java
@@ -155,14 +155,6 @@ public class EntityCache {
         }
     }
 
-    /**
-     * Re-adds all boss bars to the client by re-creating the entities attached to them.
-     * This seems to fix boss bars showing up on dimension switch, as of Bedrock 1.19.81.
-     */
-    public void addBossBars() {
-        bossBars.values().forEach(BossBar::addBossBar);
-    }
-
     public void updateBossBars() {
         bossBars.values().forEach(BossBar::updateBossBar);
     }
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockActionTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockActionTranslator.java
index 5781dd032..5df3d66cc 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockActionTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/BedrockActionTranslator.java
@@ -87,6 +87,9 @@ public class BedrockActionTranslator extends PacketTranslator<PlayerActionPacket
 
                 // Bounding box must be sent after a player dies and respawns since 1.19.40
                 entity.updateBoundingBox();
+
+                // Needed here since 1.19.81 for dimension switching
+                session.getEntityCache().updateBossBars();
                 break;
             case START_SWIMMING:
                 if (!entity.getFlag(EntityFlag.SWIMMING)) {
@@ -237,8 +240,6 @@ public class BedrockActionTranslator extends PacketTranslator<PlayerActionPacket
                 attributesPacket.setRuntimeEntityId(entity.getGeyserId());
                 attributesPacket.getAttributes().addAll(entity.getAttributes().values());
                 session.sendUpstreamPacket(attributesPacket);
-
-                session.getEntityCache().addBossBars();
                 break;
             case JUMP:
                 entity.setOnGround(false); // Increase block break time while jumping