diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml index 73c430d5..bbc49199 100644 --- a/SubServers.Bungee/pom.xml +++ b/SubServers.Bungee/pom.xml @@ -30,14 +30,14 @@ net.ME1312.Galaxi GalaxiUtil - 19w51a + 20w04c compile true net.ME1312.Galaxi GalaxiEngine - 19w51a + 20w04c provided diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java index 9dbd4625..ef362fe8 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java @@ -72,7 +72,7 @@ public final class SubProxy extends BungeeCord implements Listener { public SubProtocol subprotocol; public SubDataServer subdata = null; public SubServer sudo = null; - public static final Version version = Version.fromString("2.15a/rv2"); + public static final Version version = Version.fromString("2.15a/rv3"); public Proxy redis = null; public boolean canSudo = false; @@ -797,6 +797,25 @@ public final class SubProxy extends BungeeCord implements Listener { return servers; } + /** + * Emulate Waterfall's getServersCopy() + * + * @return Server Map Copy (which is the default, by the way) + */ + public Map getServersCopy() { + return getServers(); + } + + /** + * Force BungeeCord's implementation of getServerInfo() + * + * @return ServerInfo + */ + @Override + public ServerInfo getServerInfo(String name) { + return getServers().get(name); + } + @EventHandler(priority = Byte.MAX_VALUE) public void ping(ProxyPingEvent e) { int offline = 0; diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml index 570a931f..facacb62 100644 --- a/SubServers.Client/Bukkit/pom.xml +++ b/SubServers.Client/Bukkit/pom.xml @@ -48,7 +48,7 @@ net.ME1312.Galaxi GalaxiUtil - 19w51a + 20w04c compile true diff --git a/SubServers.Client/Sponge/pom.xml b/SubServers.Client/Sponge/pom.xml index 0b2e6ed3..b4caefd3 100644 --- a/SubServers.Client/Sponge/pom.xml +++ b/SubServers.Client/Sponge/pom.xml @@ -30,7 +30,7 @@ net.ME1312.Galaxi GalaxiUtil - 19w51a + 20w04c compile true diff --git a/SubServers.Creator/src/Spigot/template.yml b/SubServers.Creator/src/Spigot/template.yml index fae4f886..04a96c5e 100644 --- a/SubServers.Creator/src/Spigot/template.yml +++ b/SubServers.Creator/src/Spigot/template.yml @@ -8,4 +8,4 @@ Template: Can-Update: true Executable: 'bash build.sh' Settings: - Executable: 'java -Xmx1024M -Dorg.bukkit.craftbukkit.libs.jline.terminal=unix -Djansi.passthrough=true -jar Spigot.jar' \ No newline at end of file + Executable: 'java -Xmx1024M -Dorg.bukkit.craftbukkit.libs.jline.terminal=unix -Djansi.passthrough=true -jar Spigot.jar nogui' \ No newline at end of file diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml index fe9da5f7..77de9817 100644 --- a/SubServers.Host/pom.xml +++ b/SubServers.Host/pom.xml @@ -20,7 +20,7 @@ net.ME1312.Galaxi GalaxiEngine - 19w51a + 20w04c compile true diff --git a/SubServers.Sync/pom.xml b/SubServers.Sync/pom.xml index 6cc19135..27c8cf28 100644 --- a/SubServers.Sync/pom.xml +++ b/SubServers.Sync/pom.xml @@ -30,14 +30,14 @@ net.ME1312.Galaxi GalaxiUtil - 19w51a + 20w04c compile true net.ME1312.Galaxi GalaxiEngine - 19w51a + 20w04c provided diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java index 6c42302f..e8f66c11 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java @@ -57,7 +57,7 @@ public final class ExProxy extends BungeeCord implements Listener { public boolean redis = false; public final SubAPI api = new SubAPI(this); public SubProtocol subprotocol; - public static final Version version = Version.fromString("2.15a/rv2"); + public static final Version version = Version.fromString("2.15a/rv3"); public final boolean isPatched; public final boolean isGalaxi; @@ -275,6 +275,25 @@ public final class ExProxy extends BungeeCord implements Listener { } } + /** + * Emulate Waterfall's getServersCopy() + * + * @return Server Map Copy (which is the default, by the way) + */ + public Map getServersCopy() { + return getServers(); + } + + /** + * Force BungeeCord's implementation of getServerInfo() + * + * @return ServerInfo + */ + @Override + public ServerInfo getServerInfo(String name) { + return getServers().get(name); + } + /** * Reset all changes made by startListeners *