Fix experience orbs after the scoreboard rework

Fixes #5075

core/src/test/java/org/geysermc/geyser/scoreboard/network/TeamIdentifierTest.java

@@ -0,0 +1,61 @@
+/*
+ * 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.scoreboard.network;
+
+import static org.geysermc.geyser.scoreboard.network.util.AssertUtils.assertNextPacketType;
+import static org.geysermc.geyser.scoreboard.network.util.GeyserMockContextScoreboard.mockContextScoreboard;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import org.cloudburstmc.protocol.bedrock.packet.AddEntityPacket;
+import org.cloudburstmc.protocol.bedrock.packet.RemoveEntityPacket;
+import org.geysermc.geyser.translator.protocol.java.entity.JavaRemoveEntitiesTranslator;
+import org.geysermc.geyser.translator.protocol.java.entity.spawn.JavaAddExperienceOrbTranslator;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundRemoveEntitiesPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddExperienceOrbPacket;
+import org.junit.jupiter.api.Test;
+
+public class TeamIdentifierTest {
+    @Test
+    void entityWithoutUuid() {
+        // experience orbs are the only known entities without an uuid, see Entity#teamIdentifier for more info
+        mockContextScoreboard(context -> {
+            var addExperienceOrbTranslator = new JavaAddExperienceOrbTranslator();
+            var removeEntitiesTranslator = new JavaRemoveEntitiesTranslator();
+
+            // Entity#teamIdentifier used to throw because it returned uuid.toString where uuid could be null.
+            // this would result in both EntityCache#spawnEntity and EntityCache#removeEntity throwing an exception,
+            // because the entity would be registered and deregistered to the scoreboard.
+            assertDoesNotThrow(() -> {
+                context.translate(addExperienceOrbTranslator, new ClientboundAddExperienceOrbPacket(2, 0, 0, 0, 1));
+                context.translate(removeEntitiesTranslator, new ClientboundRemoveEntitiesPacket(new int[] { 2 }));
+            });
+
+            // we know that spawning and removing the entity should be fine
+            assertNextPacketType(context, AddEntityPacket.class);
+            assertNextPacketType(context, RemoveEntityPacket.class);
+        });
+    }
+}

core/src/test/java/org/geysermc/geyser/scoreboard/network/util/AssertUtils.java

@@ -42,6 +42,14 @@ public class AssertUtils {
         assertContextEquals(expected, context.nextPacket());
     }
 
+    public static void assertNextPacketType(GeyserMockContext context, Class<? extends BedrockPacket> type) {
+        var actual = context.nextPacket();
+        if (actual == null) {
+            Assertions.fail("Expected another packet! " + type);
+        }
+        Assertions.assertEquals(type, actual.getClass());
+    }
+
     public static void assertNoNextPacket(GeyserMockContext context) {
         Assertions.assertEquals(
             Collections.emptyList(),

core/src/test/java/org/geysermc/geyser/scoreboard/network/util/GeyserMockContextScoreboard.java

@@ -34,8 +34,8 @@ import static org.mockito.Mockito.when;
 
 import java.util.UUID;
 import java.util.function.Consumer;
-import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataMap;
 import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
+import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.entity.type.player.PlayerEntity;
 import org.geysermc.geyser.entity.type.player.SessionPlayerEntity;
 import org.geysermc.geyser.session.GeyserSession;
@@ -57,7 +57,10 @@ public class GeyserMockContextScoreboard {
         // GeyserSession has so many dependencies, it's easier to just mock it
         var session = context.mock(GeyserSession.class);
 
+        when(session.getGeyser()).thenReturn(context.mockOrSpy(GeyserImpl.class));
+
         when(session.locale()).thenReturn("en_US");
+
         doAnswer((Answer<Void>) invocation -> {
             context.addPacket(invocation.getArgument(0, BedrockPacket.class));
             return null;