misc: 重新在每个世界中寻找玩家

src/main/java/xyz/nifeather/morph/backends/server/renderer/network/listeners/ProtocolListener.java

@@ -17,8 +17,6 @@
 import xyz.nifeather.morph.backends.server.renderer.network.PacketFactory;
 import xyz.nifeather.morph.config.ConfigOption;
 import xyz.nifeather.morph.config.MorphConfigManager;
-import xyz.nifeather.morph.misc.NmsRecord;
-import xyz.nifeather.morph.misc.PlayerTracker;
 import xyz.nifeather.morph.utilities.NmsUtils;
 import xyz.nifeather.morph.utilities.ReflectionUtils;
 
@@ -90,15 +88,24 @@ protected Player getNmsPlayerFrom(int id)
         //if (!TickThread.isTickThread())
         //    logger.warn("Not on a tick thread! Caution for exceptions!");
 
-        var bukkitPlayer = PlayerTracker.instance().getPlayers()
-                .stream()
-                .filter(p -> p.getEntityId() == id)
-                .findFirst()
-                .orElse(null);
+        // Bukkit.getOnlinePlayers() 会将正前往不同维度的玩家从列表里移除
+        // 因此我们需要在每个世界都手动查询一遍
+        for (var world : Bukkit.getWorlds())
+        {
+            // For performance, we use NMS instead of CraftWorld
+            var nmsWorld = NmsUtils.getNmsLevel(world);
+            var worldPlayers = nmsWorld.players();
+
+            var match = worldPlayers.stream()
+                    .filter(p -> p.getId() == id)
+                    .findFirst()
+                    .orElse(null);
 
-        if (bukkitPlayer == null) return null;
+            if (match != null)
+                return match;
+        }
 
-        return NmsRecord.ofPlayer(bukkitPlayer);
+        return null;
     }
 
     @Nullable

src/main/java/xyz/nifeather/morph/events/CommonEventProcessor.java

@@ -37,7 +37,6 @@
 import xyz.nifeather.morph.messages.vanilla.VanillaMessageStore;
 import xyz.nifeather.morph.misc.DisguiseTypes;
 import xyz.nifeather.morph.misc.OfflineDisguiseResult;
-import xyz.nifeather.morph.misc.PlayerTracker;
 import xyz.nifeather.morph.misc.gui.AnimSelectScreenWrapper;
 import xyz.nifeather.morph.misc.gui.DisguiseSelectScreenWrapper;
 import xyz.nifeather.morph.misc.permissions.CommonPermissions;
@@ -362,8 +361,6 @@ public void onPlayerJoin(PlayerJoinEvent e)
         var player = e.getPlayer();
         var state = morphs.getDisguiseStateFor(player);
 
-        PlayerTracker.instance().addPlayer(player);
-
         clientHandler.markPlayerReady(player);
 
         //如果玩家是第一次用客户端连接，那么等待3秒向其发送提示
@@ -432,8 +429,6 @@ else if (result == OfflineDisguiseResult.LIMITED)
     @EventHandler
     public void onPlayerExit(PlayerQuitEvent e)
     {
-        PlayerTracker.instance().removePlayer(e.getPlayer());
-
         clientHandler.unInitializePlayer(e.getPlayer());
         skillHandler.removeUnusedList(e.getPlayer());