From a0b8df47ac1ea869fe64b97ba2945b6c2854a003 Mon Sep 17 00:00:00 2001 From: ME1312 Date: Wed, 24 Nov 2021 04:52:39 -0500 Subject: [PATCH] Update PacketExSyncPlayer --- .../Bungee/Network/Packet/PacketExSyncPlayer.java | 12 ++++++------ .../Sync/Network/Packet/PacketExSyncPlayer.java | 10 +++++----- .../Velocity/Network/Packet/PacketExSyncPlayer.java | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java index ff58cada..9c038233 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java @@ -76,10 +76,10 @@ public class PacketExSyncPlayer implements PacketObjectIn, PacketObject } } if (data.getBoolean(0x0001) != Boolean.FALSE) { - if (data.contains(0x0002)) for (Map object : (List>) data.getObjectList(0x0002)) { - Server server = (object.getOrDefault("server", null) != null)?plugin.api.getServer(object.get("server").toString()):null; - RemotePlayer player = new RemotePlayer(object.get("name").toString(), UUID.fromString(object.get("id").toString()), (Proxy) client.getHandler(), server, - new InetSocketAddress(object.get("address").toString().split(":")[0], Integer.parseInt(object.get("address").toString().split(":")[1]))); + if (data.contains(0x0002)) for (ObjectMap object : (List>) (List) data.getMapList(0x0002)) { + Server server = (object.contains("server"))?plugin.api.getServer(object.getString("server")):null; + RemotePlayer player = new RemotePlayer(object.getString("name"), object.getUUID("id"), (Proxy) client.getHandler(), server, + new InetSocketAddress(object.getString("address").split(":")[0], Integer.parseInt(object.getString("address").split(":")[1]))); forward.add(player); plugin.rPlayerLinkP.put(player.getUniqueId(), (Proxy) client.getHandler()); @@ -87,8 +87,8 @@ public class PacketExSyncPlayer implements PacketObjectIn, PacketObject if (server != null) plugin.rPlayerLinkS.put(player.getUniqueId(), server); } } else { - if (data.contains(0x0002)) for (Map object : (List>) data.getObjectList(0x0002)) { - UUID id = UUID.fromString(object.get("id").toString()); + if (data.contains(0x0002)) for (ObjectMap object : (List>) (List) data.getMapList(0x0002)) { + UUID id = object.getUUID("id"); RemotePlayer player = plugin.rPlayers.get(id); // Don't accept removal requests from non-managing proxies diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java index bf40359e..db668e15 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java @@ -68,17 +68,17 @@ public class PacketExSyncPlayer implements PacketObjectIn, PacketObject } } if (data.getBoolean(0x0001) != Boolean.FALSE) { - if (data.contains(0x0002)) for (Map object : (List>) data.getObjectList(0x0002)) { - ServerImpl server = (object.getOrDefault("server", null) != null)?plugin.servers.getOrDefault(object.get("server").toString().toLowerCase(), null):null; - CachedPlayer player = new CachedPlayer(new ObjectMap<>(object)); + if (data.contains(0x0002)) for (ObjectMap object : (List>) (List) data.getMapList(0x0002)) { + ServerImpl server = (object.contains("server"))?plugin.servers.getOrDefault(object.getString("server").toLowerCase(), null):null; + CachedPlayer player = new CachedPlayer(object); plugin.rPlayerLinkP.put(player.getUniqueId(), proxy); plugin.rPlayers.put(player.getUniqueId(), player); if (server != null) plugin.rPlayerLinkS.put(player.getUniqueId(), server); } } else { - if (data.contains(0x0002)) for (Map object : (List>) data.getObjectList(0x0002)) { - UUID id = UUID.fromString(object.get("id").toString()); + if (data.contains(0x0002)) for (ObjectMap object : (List>) (List) data.getMapList(0x0002)) { + UUID id = object.getUUID("id"); // Don't accept removal requests when we're managing players if ((!plugin.rPlayerLinkP.containsKey(id) || !plugin.rPlayerLinkP.get(id).equalsIgnoreCase(plugin.api.getName().toLowerCase()))) { diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExSyncPlayer.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExSyncPlayer.java index ecd06533..5656a972 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExSyncPlayer.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExSyncPlayer.java @@ -70,17 +70,17 @@ public class PacketExSyncPlayer implements PacketObjectIn, PacketObject } } if (data.getBoolean(0x0001) != Boolean.FALSE) { - if (data.contains(0x0002)) for (Map object : (List>) data.getObjectList(0x0002)) { - ServerData server = (object.getOrDefault("server", null) != null)?ExProxy.getInstance().getServer(object.get("server").toString()).map(RegisteredServer::getServerInfo).map(plugin::getData).orElse(null):null; - CachedPlayer player = new CachedPlayer(new ObjectMap<>(object)); + if (data.contains(0x0002)) for (ObjectMap object : (List>) (List) data.getMapList(0x0002)) { + ServerData server = (object.contains("server"))?ExProxy.getInstance().getServer(object.getString("server")).map(RegisteredServer::getServerInfo).map(plugin::getData).orElse(null):null; + CachedPlayer player = new CachedPlayer(object); plugin.rPlayerLinkP.put(player.getUniqueId(), proxy); plugin.rPlayers.put(player.getUniqueId(), player); if (server != null) plugin.rPlayerLinkS.put(player.getUniqueId(), server); } } else { - if (data.contains(0x0002)) for (Map object : (List>) data.getObjectList(0x0002)) { - UUID id = UUID.fromString(object.get("id").toString()); + if (data.contains(0x0002)) for (ObjectMap object : (List>) (List) data.getMapList(0x0002)) { + UUID id = object.getUUID("id"); // Don't accept removal requests when we're managing players if ((!plugin.rPlayerLinkP.containsKey(id) || !plugin.rPlayerLinkP.get(id).equalsIgnoreCase(plugin.api.getName().toLowerCase()))) {