Upstream/SubServers-2
1
0
Fork 0
mirror of https://github.com/ME1312/SubServers-2.git synced 2024-11-22 02:08:27 +01:00
Code Issues Projects Releases Wiki Activity

Update PacketExSyncPlayer

Browse Source
This commit is contained in:
ME1312 2021-11-24 04:52:39 -05:00
parent c137906fcd
commit a0b8df47ac
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java
View File

@ -76,10 +76,10 @@ public class PacketExSyncPlayer implements PacketObjectIn<Integer>, PacketObject
} }
} }
if (data.getBoolean(0x0001) != Boolean.FALSE) { if (data.getBoolean(0x0001) != Boolean.FALSE) {
if (data.contains(0x0002)) for (Map<String, Object> object : (List<Map<String, Object>>) data.getObjectList(0x0002)) { if (data.contains(0x0002)) for (ObjectMap<String> object : (List<ObjectMap<String>>) (List<?>) data.getMapList(0x0002)) {
Server server = (object.getOrDefault("server", null) != null)?plugin.api.getServer(object.get("server").toString()):null; Server server = (object.contains("server"))?plugin.api.getServer(object.getString("server")):null;
RemotePlayer player = new RemotePlayer(object.get("name").toString(), UUID.fromString(object.get("id").toString()), (Proxy) client.getHandler(), server, RemotePlayer player = new RemotePlayer(object.getString("name"), object.getUUID("id"), (Proxy) client.getHandler(), server,
new InetSocketAddress(object.get("address").toString().split(":")[0], Integer.parseInt(object.get("address").toString().split(":")[1]))); new InetSocketAddress(object.getString("address").split(":")[0], Integer.parseInt(object.getString("address").split(":")[1])));
forward.add(player); forward.add(player);
plugin.rPlayerLinkP.put(player.getUniqueId(), (Proxy) client.getHandler()); plugin.rPlayerLinkP.put(player.getUniqueId(), (Proxy) client.getHandler());
@ -87,8 +87,8 @@ public class PacketExSyncPlayer implements PacketObjectIn<Integer>, PacketObject
if (server != null) plugin.rPlayerLinkS.put(player.getUniqueId(), server); if (server != null) plugin.rPlayerLinkS.put(player.getUniqueId(), server);
} }
} else { } else {
if (data.contains(0x0002)) for (Map<String, Object> object : (List<Map<String, Object>>) data.getObjectList(0x0002)) { if (data.contains(0x0002)) for (ObjectMap<String> object : (List<ObjectMap<String>>) (List<?>) data.getMapList(0x0002)) {
UUID id = UUID.fromString(object.get("id").toString()); UUID id = object.getUUID("id");
RemotePlayer player = plugin.rPlayers.get(id); RemotePlayer player = plugin.rPlayers.get(id);
// Don't accept removal requests from non-managing proxies // Don't accept removal requests from non-managing proxies

10
SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java
View File

@ -68,17 +68,17 @@ public class PacketExSyncPlayer implements PacketObjectIn<Integer>, PacketObject
} }
} }
if (data.getBoolean(0x0001) != Boolean.FALSE) { if (data.getBoolean(0x0001) != Boolean.FALSE) {
if (data.contains(0x0002)) for (Map<String, Object> object : (List<Map<String, Object>>) data.getObjectList(0x0002)) { if (data.contains(0x0002)) for (ObjectMap<String> object : (List<ObjectMap<String>>) (List<?>) data.getMapList(0x0002)) {
ServerImpl server = (object.getOrDefault("server", null) != null)?plugin.servers.getOrDefault(object.get("server").toString().toLowerCase(), null):null; ServerImpl server = (object.contains("server"))?plugin.servers.getOrDefault(object.getString("server").toLowerCase(), null):null;
CachedPlayer player = new CachedPlayer(new ObjectMap<>(object)); CachedPlayer player = new CachedPlayer(object);
plugin.rPlayerLinkP.put(player.getUniqueId(), proxy); plugin.rPlayerLinkP.put(player.getUniqueId(), proxy);
plugin.rPlayers.put(player.getUniqueId(), player); plugin.rPlayers.put(player.getUniqueId(), player);
if (server != null) plugin.rPlayerLinkS.put(player.getUniqueId(), server); if (server != null) plugin.rPlayerLinkS.put(player.getUniqueId(), server);
} }
} else { } else {
if (data.contains(0x0002)) for (Map<String, Object> object : (List<Map<String, Object>>) data.getObjectList(0x0002)) { if (data.contains(0x0002)) for (ObjectMap<String> object : (List<ObjectMap<String>>) (List<?>) data.getMapList(0x0002)) {
UUID id = UUID.fromString(object.get("id").toString()); UUID id = object.getUUID("id");
// Don't accept removal requests when we're managing players // Don't accept removal requests when we're managing players
if ((!plugin.rPlayerLinkP.containsKey(id) || !plugin.rPlayerLinkP.get(id).equalsIgnoreCase(plugin.api.getName().toLowerCase()))) { if ((!plugin.rPlayerLinkP.containsKey(id) || !plugin.rPlayerLinkP.get(id).equalsIgnoreCase(plugin.api.getName().toLowerCase()))) {

10
SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExSyncPlayer.java
View File

@ -70,17 +70,17 @@ public class PacketExSyncPlayer implements PacketObjectIn<Integer>, PacketObject
} }
} }
if (data.getBoolean(0x0001) != Boolean.FALSE) { if (data.getBoolean(0x0001) != Boolean.FALSE) {
if (data.contains(0x0002)) for (Map<String, Object> object : (List<Map<String, Object>>) data.getObjectList(0x0002)) { if (data.contains(0x0002)) for (ObjectMap<String> object : (List<ObjectMap<String>>) (List<?>) data.getMapList(0x0002)) {
ServerData server = (object.getOrDefault("server", null) != null)?ExProxy.getInstance().getServer(object.get("server").toString()).map(RegisteredServer::getServerInfo).map(plugin::getData).orElse(null):null; ServerData server = (object.contains("server"))?ExProxy.getInstance().getServer(object.getString("server")).map(RegisteredServer::getServerInfo).map(plugin::getData).orElse(null):null;
CachedPlayer player = new CachedPlayer(new ObjectMap<>(object)); CachedPlayer player = new CachedPlayer(object);
plugin.rPlayerLinkP.put(player.getUniqueId(), proxy); plugin.rPlayerLinkP.put(player.getUniqueId(), proxy);
plugin.rPlayers.put(player.getUniqueId(), player); plugin.rPlayers.put(player.getUniqueId(), player);
if (server != null) plugin.rPlayerLinkS.put(player.getUniqueId(), server); if (server != null) plugin.rPlayerLinkS.put(player.getUniqueId(), server);
} }
} else { } else {
if (data.contains(0x0002)) for (Map<String, Object> object : (List<Map<String, Object>>) data.getObjectList(0x0002)) { if (data.contains(0x0002)) for (ObjectMap<String> object : (List<ObjectMap<String>>) (List<?>) data.getMapList(0x0002)) {
UUID id = UUID.fromString(object.get("id").toString()); UUID id = object.getUUID("id");
// Don't accept removal requests when we're managing players // Don't accept removal requests when we're managing players
if ((!plugin.rPlayerLinkP.containsKey(id) || !plugin.rPlayerLinkP.get(id).equalsIgnoreCase(plugin.api.getName().toLowerCase()))) { if ((!plugin.rPlayerLinkP.containsKey(id) || !plugin.rPlayerLinkP.get(id).equalsIgnoreCase(plugin.api.getName().toLowerCase()))) {