Use initial uuid for internal tablist packets to prevent duplicates

Elytrium · May 11, 2024 · 417b257 · 417b257
1 parent 8d44b93
commit 417b257
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginTasksQueue.java b/plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginTasksQueue.java
@@ -68,6 +68,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Queue;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import net.elytrium.commons.utils.reflection.ReflectionException;
 import net.elytrium.limboapi.LimboAPI;
@@ -131,22 +132,23 @@ private void finish() {
     eventManager.fire(new GameProfileRequestEvent(this.inbound, this.player.getGameProfile(), this.player.isOnlineMode())).thenAcceptAsync(
         gameProfile -> {
           try {
+            UUID uuid = this.plugin.getInitialID(this.player);
             if (connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_19_1) <= 0) {
               connection.delayedWrite(new LegacyPlayerListItemPacket(
                   LegacyPlayerListItemPacket.REMOVE_PLAYER,
-                  List.of(new LegacyPlayerListItemPacket.Item(this.player.getUniqueId()))
+                  List.of(new LegacyPlayerListItemPacket.Item(uuid))
               ));
 
               connection.delayedWrite(new LegacyPlayerListItemPacket(
                   LegacyPlayerListItemPacket.ADD_PLAYER,
                   List.of(
-                      new LegacyPlayerListItemPacket.Item(this.player.getUniqueId())
+                      new LegacyPlayerListItemPacket.Item(uuid)
                           .setName(gameProfile.getUsername())
                           .setProperties(gameProfile.getGameProfile().getProperties())
                   )
               ));
             } else if (connection.getState() != StateRegistry.CONFIG) {
-              UpsertPlayerInfoPacket.Entry playerInfoEntry = new UpsertPlayerInfoPacket.Entry(this.player.getUniqueId());
+              UpsertPlayerInfoPacket.Entry playerInfoEntry = new UpsertPlayerInfoPacket.Entry(uuid);
               playerInfoEntry.setDisplayName(new ComponentHolder(this.player.getProtocolVersion(), Component.text(gameProfile.getUsername())));
               playerInfoEntry.setProfile(gameProfile.getGameProfile());
 

diff --git a/plugin/src/main/java/net/elytrium/limboapi/server/LimboImpl.java b/plugin/src/main/java/net/elytrium/limboapi/server/LimboImpl.java
@@ -539,18 +539,19 @@ protected void onSpawn(Class<? extends LimboSessionHandler> handlerClass,
 
     MinecraftPacket playerInfoPacket;
 
+    UUID uuid = this.plugin.getInitialID(player);
     if (connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_19_1) <= 0) {
       playerInfoPacket = new LegacyPlayerListItemPacket(
           LegacyPlayerListItemPacket.ADD_PLAYER,
           List.of(
-              new LegacyPlayerListItemPacket.Item(player.getUniqueId())
+              new LegacyPlayerListItemPacket.Item(uuid)
                   .setName(player.getUsername())
                   .setGameMode(this.gameMode)
                   .setProperties(player.getGameProfileProperties())
           )
       );
     } else {
-      UpsertPlayerInfoPacket.Entry playerInfoEntry = new UpsertPlayerInfoPacket.Entry(player.getUniqueId());
+      UpsertPlayerInfoPacket.Entry playerInfoEntry = new UpsertPlayerInfoPacket.Entry(uuid);
       playerInfoEntry.setDisplayName(new ComponentHolder(player.getProtocolVersion(), Component.text(player.getUsername())));
       playerInfoEntry.setGameMode(this.gameMode);
       playerInfoEntry.setProfile(player.getGameProfile());

diff --git a/plugin/src/main/java/net/elytrium/limboapi/server/LimboPlayerImpl.java b/plugin/src/main/java/net/elytrium/limboapi/server/LimboPlayerImpl.java
@@ -31,6 +31,7 @@
 import java.awt.image.BufferedImage;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.ScheduledExecutorService;
 import net.elytrium.limboapi.LimboAPI;
 import net.elytrium.limboapi.api.Limbo;
@@ -200,16 +201,17 @@ public void setGameMode(GameMode gameMode) {
       int id = this.gameMode.getID();
       this.sendAbilities();
       if (!is17) {
+        UUID uuid = this.plugin.getInitialID(this.player);
         if (this.connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_19_1) <= 0) {
           this.writePacket(
               new LegacyPlayerListItemPacket(LegacyPlayerListItemPacket.UPDATE_GAMEMODE,
                   List.of(
-                      new LegacyPlayerListItemPacket.Item(this.player.getUniqueId()).setGameMode(id)
+                      new LegacyPlayerListItemPacket.Item(uuid).setGameMode(id)
                   )
               )
           );
         } else {
-          UpsertPlayerInfoPacket.Entry playerInfoEntry = new UpsertPlayerInfoPacket.Entry(this.player.getUniqueId());
+          UpsertPlayerInfoPacket.Entry playerInfoEntry = new UpsertPlayerInfoPacket.Entry(uuid);
           playerInfoEntry.setGameMode(id);
 
           this.writePacket(new UpsertPlayerInfoPacket(EnumSet.of(UpsertPlayerInfoPacket.Action.UPDATE_GAME_MODE), List.of(playerInfoEntry)));
@@ -305,7 +307,7 @@ private void sendToRegisteredServer(RegisteredServer server) {
       if (this.connection.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_19_1) <= 0) {
         this.connection.delayedWrite(new LegacyPlayerListItemPacket(
             LegacyPlayerListItemPacket.REMOVE_PLAYER,
-            List.of(new LegacyPlayerListItemPacket.Item(this.player.getUniqueId()))
+            List.of(new LegacyPlayerListItemPacket.Item(this.plugin.getInitialID(this.player)))
         ));
       }