Empty player list on phase transition, despawn skulls, always reset w…

…eather (GeyserMC#4847)

* Empty player list on transition, despawn skulls

* Always reset weather

core/src/main/java/org/geysermc/geyser/session/cache/EntityCache.java

@@ -141,6 +141,10 @@ public Collection<PlayerEntity> getAllPlayerEntities() {
         return playerEntities.values();
     }
 
+    public void removeAllPlayerEntities() {
+        playerEntities.clear();
+    }
+
     public void addBossBar(UUID uuid, BossBar bossBar) {
         bossBars.put(uuid, bossBar);
         bossBar.addBossBar();

core/src/main/java/org/geysermc/geyser/session/cache/SkullCache.java

@@ -50,9 +50,9 @@
 public class SkullCache {
     private final int maxVisibleSkulls;
     private final boolean cullingEnabled;
-    
+
     private final int skullRenderDistanceSquared;
-    
+
     /**
      * The time in milliseconds before unused skull entities are despawned
      */
@@ -243,8 +243,16 @@ private void reassignSkullEntity(Skull skull) {
     }
 
     public void clear() {
+        for (Skull skull : skulls.values()) {
+            if (skull.entity != null) {
+                skull.entity.despawnEntity();
+            }
+        }
         skulls.clear();
         inRangeSkulls.clear();
+        for (SkullPlayerEntity skull : unusedSkullEntities) {
+            skull.despawnEntity();
+        }
         unusedSkullEntities.clear();
         totalSkullEntities = 0;
         lastPlayerPosition = null;
@@ -279,4 +287,4 @@ public static class Skull {
         private final Vector3i position;
         private int distanceSquared;
     }
-}
+}

core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaFinishConfigurationPacketTranslator.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2024 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.translator.protocol.java;
+
+import org.cloudburstmc.protocol.bedrock.packet.PlayerListPacket;
+import org.geysermc.geyser.entity.type.player.PlayerEntity;
+import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.protocol.PacketTranslator;
+import org.geysermc.geyser.translator.protocol.Translator;
+import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundFinishConfigurationPacket;
+
+@Translator(packet = ClientboundFinishConfigurationPacket.class)
+public class JavaFinishConfigurationPacketTranslator extends PacketTranslator<ClientboundFinishConfigurationPacket> {
+
+    @Override
+    public void translate(GeyserSession session, ClientboundFinishConfigurationPacket packet) {
+        // Clear the player list, as on Java the player list is cleared after transitioning from config to play phase
+        PlayerListPacket playerListPacket = new PlayerListPacket();
+        playerListPacket.setAction(PlayerListPacket.Action.REMOVE);
+        for (PlayerEntity otherEntity : session.getEntityCache().getAllPlayerEntities()) {
+            playerListPacket.getEntries().add(new PlayerListPacket.Entry(otherEntity.getTabListUuid()));
+        }
+        session.sendUpstreamPacket(playerListPacket);
+        session.getEntityCache().removeAllPlayerEntities();
+    }
+}

core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java

@@ -76,25 +76,6 @@ public void translate(GeyserSession session, ClientboundLoginPacket packet) {
             // Remove extra hearts, hunger, etc.
             entity.resetAttributes();
             entity.resetMetadata();
-
-            // Reset weather
-            if (session.isRaining()) {
-                LevelEventPacket stopRainPacket = new LevelEventPacket();
-                stopRainPacket.setType(LevelEvent.STOP_RAINING);
-                stopRainPacket.setData(0);
-                stopRainPacket.setPosition(Vector3f.ZERO);
-                session.sendUpstreamPacket(stopRainPacket);
-                session.setRaining(false);
-            }
-
-            if (session.isThunder()) {
-                LevelEventPacket stopThunderPacket = new LevelEventPacket();
-                stopThunderPacket.setType(LevelEvent.STOP_THUNDERSTORM);
-                stopThunderPacket.setData(0);
-                stopThunderPacket.setPosition(Vector3f.ZERO);
-                session.sendUpstreamPacket(stopThunderPacket);
-                session.setThunder(false);
-            }
         }
 
         session.setWorldName(spawnInfo.getWorldName());

core/src/main/java/org/geysermc/geyser/util/DimensionUtils.java

@@ -27,6 +27,7 @@
 
 import org.cloudburstmc.math.vector.Vector3f;
 import org.cloudburstmc.math.vector.Vector3i;
+import org.cloudburstmc.protocol.bedrock.data.LevelEvent;
 import org.cloudburstmc.protocol.bedrock.data.PlayerActionType;
 import org.cloudburstmc.protocol.bedrock.packet.*;
 import org.geysermc.geyser.entity.type.Entity;
@@ -110,6 +111,21 @@ public static void switchDimension(GeyserSession session, int javaDimension) {
         // Effects are re-sent from server
         entityEffects.clear();
 
+        // Always reset weather, as it sometimes suddenly starts raining. See https://github.com/GeyserMC/Geyser/issues/3679
+        LevelEventPacket stopRainPacket = new LevelEventPacket();
+        stopRainPacket.setType(LevelEvent.STOP_RAINING);
+        stopRainPacket.setData(0);
+        stopRainPacket.setPosition(Vector3f.ZERO);
+        session.sendUpstreamPacket(stopRainPacket);
+        session.setRaining(false);
+        LevelEventPacket stopThunderPacket = new LevelEventPacket();
+        stopThunderPacket.setType(LevelEvent.STOP_THUNDERSTORM);
+        stopThunderPacket.setData(0);
+        stopThunderPacket.setPosition(Vector3f.ZERO);
+        session.sendUpstreamPacket(stopThunderPacket);
+        session.setThunder(false);
+
+
         //let java server handle portal travel sound
         StopSoundPacket stopSoundPacket = new StopSoundPacket();
         stopSoundPacket.setStoppingAllSound(true);