From c137906fcd3a3c4df74fae78bf36d9490a5019c3 Mon Sep 17 00:00:00 2001 From: ME1312 Date: Mon, 25 Oct 2021 01:12:06 -0400 Subject: [PATCH] Update SubData --- SubServers.Bungee/common/pom.xml | 2 +- SubServers.Bungee/pom.xml | 2 +- .../Bungee/Network/Packet/PacketExAddServer.java | 2 +- .../Network/Packet/PacketExDeleteServer.java | 16 ++++++---------- SubServers.Client/Common/pom.xml | 4 ++-- SubServers.Host/pom.xml | 4 ++-- 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/SubServers.Bungee/common/pom.xml b/SubServers.Bungee/common/pom.xml index da027e78..3c319696 100644 --- a/SubServers.Bungee/common/pom.xml +++ b/SubServers.Bungee/common/pom.xml @@ -28,7 +28,7 @@ net.ME1312.Galaxi GalaxiUtil - 21w44b + 21w44c compile diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml index 503332d5..2d27185a 100644 --- a/SubServers.Bungee/pom.xml +++ b/SubServers.Bungee/pom.xml @@ -34,7 +34,7 @@ net.ME1312.SubData Server - 21w44a + 21w44b compile diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java index b30bb56c..221c3e44 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java @@ -52,7 +52,7 @@ public class PacketExAddServer implements PacketObjectIn, PacketObjectO @Override public ObjectMap send(SubDataClient client) { ObjectMap data = new ObjectMap(); - if (tracker != null) data.set(0x0000, tracker); + data.set(0x0000, tracker); data.set(0x0001, name); data.set(0x0002, enabled); data.set(0x0003, port); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDeleteServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDeleteServer.java index 8fc5e712..90900bff 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDeleteServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDeleteServer.java @@ -44,16 +44,12 @@ public class PacketExDeleteServer implements PacketObjectIn, PacketObje @Override public ObjectMap send(SubDataClient client) { - if (tracker == null) { - return null; - } else { - ObjectMap data = new ObjectMap(); - data.set(0x0000, tracker); - data.set(0x0001, name); - data.set(0x0002, info); - if (recycle) data.set(0x0003, true); - return data; - } + ObjectMap data = new ObjectMap(); + data.set(0x0000, tracker); + data.set(0x0001, name); + data.set(0x0002, info); + if (recycle) data.set(0x0003, true); + return data; } @Override diff --git a/SubServers.Client/Common/pom.xml b/SubServers.Client/Common/pom.xml index b749a217..b96df2d8 100644 --- a/SubServers.Client/Common/pom.xml +++ b/SubServers.Client/Common/pom.xml @@ -18,13 +18,13 @@ net.ME1312.Galaxi GalaxiUtil - 21w44b + 21w44c compile net.ME1312.SubData Client - 21w44a + 21w44b compile diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml index 6212add1..7f53f53d 100644 --- a/SubServers.Host/pom.xml +++ b/SubServers.Host/pom.xml @@ -30,13 +30,13 @@ net.ME1312.Galaxi GalaxiEngine - 21w44b + 21w44c compile net.ME1312.Galaxi GalaxiUI - 21w44b + 21w44c runtime