From c5573801c4fed46bcbf947f683d36b01a6eb1c2e Mon Sep 17 00:00:00 2001 From: ME1312 Date: Fri, 31 Dec 2021 17:55:56 -0500 Subject: [PATCH] Minor reference changes --- .../Host/External/ExternalSubCreator.java | 4 ++-- .../Host/Internal/InternalSubCreator.java | 4 ++-- .../SubServers/Bungee/Host/RemotePlayer.java | 8 +++---- .../Network/Packet/PacketMessagePlayer.java | 2 +- .../SubServers/Client/Bukkit/SubCommand.java | 2 +- .../SubServers/Client/Common/ClientAPI.java | 4 ++-- .../Client/Common/Network/API/Host.java | 8 +++---- .../Client/Common/Network/API/Proxy.java | 2 +- .../Common/Network/API/RemotePlayer.java | 12 +++++----- .../Client/Common/Network/API/Server.java | 4 ++-- .../Common/Network/API/SimplifiedData.java | 24 +++++++++---------- .../Client/Common/Network/API/SubCreator.java | 4 ++-- .../Client/Common/Network/API/SubServer.java | 14 +++++------ .../Library/Compatibility/ChatColor.java | 15 +++++------- .../SubServers/Client/Sponge/SubCommand.java | 2 +- .../ME1312/SubServers/Host/SubCommand.java | 2 +- .../ME1312/SubServers/Sync/SubCommand.java | 2 +- .../SubServers/Velocity/SubCommand.java | 2 +- 18 files changed, 56 insertions(+), 59 deletions(-) diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java index 42122436..6cd0e1ec 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java @@ -95,7 +95,7 @@ public class ExternalSubCreator extends SubCreator { public boolean create(UUID player, String name, ServerTemplate template, Version version, Integer port, Consumer callback) { Util.nullpo(name, template); if (host.isAvailable() && host.isEnabled() && template.isEnabled() && !SubAPI.getInstance().getSubServers().keySet().contains(name.toLowerCase()) && !SubCreator.isReserved(name) && (version != null || !template.requiresVersion())) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); if (port == null) { Container i = new Container(ports.lowerEndpoint() - 1); @@ -141,7 +141,7 @@ public class ExternalSubCreator extends SubCreator { Util.nullpo(server); final ServerTemplate ft = (template == null)?server.getTemplate():template; if (host.isAvailable() && host.isEnabled() && host == server.getHost() && server.isAvailable() && !server.isRunning() && ft != null && ft.isEnabled() && ft.canUpdate() && (version != null || !ft.requiresVersion())) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); String name = server.getName(); String prefix = name + File.separator + "Updater"; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java index 0f2cd56f..716e0a3f 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java @@ -390,7 +390,7 @@ public class InternalSubCreator extends SubCreator { public boolean create(UUID player, String name, ServerTemplate template, Version version, Integer port, Consumer callback) { Util.nullpo(name, template); if (host.isAvailable() && host.isEnabled() && template.isEnabled() && !SubAPI.getInstance().getSubServers().keySet().contains(name.toLowerCase()) && !SubCreator.isReserved(name) && (version != null || !template.requiresVersion())) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); if (port == null) { Value i = new Container(ports.lowerEndpoint() - 1); @@ -432,7 +432,7 @@ public class InternalSubCreator extends SubCreator { Util.nullpo(server); final ServerTemplate ft = (template == null)?server.getTemplate():template; if (host.isAvailable() && host.isEnabled() && host == server.getHost() && server.isAvailable() && !server.isRunning() && ft != null && ft.isEnabled() && ft.canUpdate() && (version != null || !ft.requiresVersion())) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); ((InternalSubServer) server).updating(true); CreatorTask task = new CreatorTask(player, server, ft, version, x -> { diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java index 515166e2..2cfd562c 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java @@ -159,7 +159,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat new RPSI() { @Override protected void sendMessage(UUID[] players, String[] messages, IntConsumer response) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); PacketMessagePlayer.run(Arrays.asList(players), new ContainedPair<>(messages, null), null, i -> { try { response.accept(i); @@ -173,7 +173,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat @Override protected void sendMessage(UUID[] players, BaseComponent[][] messages, IntConsumer response) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); PacketMessagePlayer.run(Arrays.asList(players), new ContainedPair<>(null, messages), null, i -> { try { response.accept(i); @@ -187,7 +187,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat @Override protected void transfer(UUID[] players, String server, IntConsumer response) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); PacketTransferPlayer.run(Arrays.asList(players), server, i -> { try { response.accept(i); @@ -201,7 +201,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat @Override protected void disconnect(UUID[] players, String reason, IntConsumer response) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); PacketDisconnectPlayer.run(Arrays.asList(players), reason, i -> { try { response.accept(i); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketMessagePlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketMessagePlayer.java index b4037cfe..226c4ebd 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketMessagePlayer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketMessagePlayer.java @@ -75,7 +75,7 @@ public class PacketMessagePlayer implements PacketObjectIn, PacketObjec ProxyServer.getInstance().broadcast(c); } for (Proxy proxy : SubAPI.getInstance().getProxies().values()) { - if (proxy.getPlayers().size() > 0) requests.put(proxy, null); + if (proxy.getPlayers().size() > 0 && proxy.getSubData()[0] != null) requests.put(proxy, null); } } else { for (UUID id : ids) { diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java index 3f8ce27f..add04403 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java @@ -890,7 +890,7 @@ public final class SubCommand extends Command { } @SuppressWarnings("unchecked") private void selectServers(CommandSender sender, String[] rargs, int index, boolean mode, String[][] permissions, Consumer callback) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); LinkedList msgs = new LinkedList(); LinkedList args = new LinkedList(); LinkedList selection = new LinkedList(); diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/ClientAPI.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/ClientAPI.java index 43857bb5..d1bbb5c1 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/ClientAPI.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/ClientAPI.java @@ -138,7 +138,7 @@ public abstract class ClientAPI { */ public void addServer(UUID player, String name, InetAddress ip, int port, String motd, boolean hidden, boolean restricted, IntConsumer response) { Util.nullpo(response); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); ((SubDataClient) getSubDataNetwork()[0]).sendPacket(new PacketAddServer(player, name, ip, port, motd, hidden, restricted, data -> { try { response.accept(data.getInt(0x0001)); @@ -265,7 +265,7 @@ public abstract class ClientAPI { private void removeServer(UUID player, String name, boolean force, IntConsumer response) { Util.nullpo(response); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); ((SubDataClient) getSubDataNetwork()[0]).sendPacket(new PacketRemoveServer(player, name, force, data -> { try { response.accept(data.getInt(0x0001)); diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java index 993e75aa..d6dfc803 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java @@ -176,7 +176,7 @@ public class Host { */ public void getRemotePlayers(Consumer> callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); Runnable run = () -> { try { callback.accept(players); @@ -363,7 +363,7 @@ public class Host { */ public void addSubServer(UUID player, String name, boolean enabled, int port, String motd, boolean log, String directory, String executable, String stopcmd, boolean hidden, boolean restricted, IntConsumer response) { Util.nullpo(response); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client().sendPacket(new PacketAddServer(player, name, enabled, getName(), port, motd, log, directory, executable, stopcmd, hidden, restricted, data -> { try { response.accept(data.getInt(0x0001)); @@ -500,7 +500,7 @@ public class Host { private void removeSubServer(UUID player, String name, boolean force, IntConsumer response) { Util.nullpo(response); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client().sendPacket(new PacketRemoveServer(player, name, force, data -> { try { response.accept(data.getInt(0x0001)); @@ -686,7 +686,7 @@ public class Host { private void deleteSubServer(UUID player, String name, boolean recycle, boolean force, IntConsumer response) { Util.nullpo(response); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client().sendPacket(new PacketDeleteServer(player, name, recycle, force, data -> { try { response.accept(data.getInt(0x0001)); diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java index 14a2f20e..851da938 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java @@ -131,7 +131,7 @@ public class Proxy { */ public void getPlayers(Consumer> callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); Runnable run = () -> { try { callback.accept(players); diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/RemotePlayer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/RemotePlayer.java index 37a2485b..07e5655a 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/RemotePlayer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/RemotePlayer.java @@ -116,7 +116,7 @@ public class RemotePlayer { */ public void getProxy(Consumer callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); Runnable run = () -> { try { callback.accept(proxy); @@ -153,7 +153,7 @@ public class RemotePlayer { */ public void getServer(Consumer callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); Runnable run = () -> { try { callback.accept(server); @@ -543,7 +543,7 @@ public class RemotePlayer { * @param response Success Status */ protected void sendMessage(SubDataClient client, UUID[] players, String[] messages, IntConsumer response) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client.sendPacket(new PacketMessagePlayer(players, messages, null, data -> { try { response.accept(data.getInt(0x0001)); @@ -564,7 +564,7 @@ public class RemotePlayer { * @param response Success Status */ protected void sendRawMessage(SubDataClient client, UUID[] players, String[] messages, IntConsumer response) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client.sendPacket(new PacketMessagePlayer(players, null, messages, data -> { try { response.accept(data.getInt(0x0001)); @@ -585,7 +585,7 @@ public class RemotePlayer { * @param response Success Status */ protected void transfer(SubDataClient client, UUID[] players, String server, IntConsumer response) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client.sendPacket(new PacketTransferPlayer(players, server, data -> { try { response.accept(data.getInt(0x0001)); @@ -606,7 +606,7 @@ public class RemotePlayer { * @param response Success status */ protected void disconnect(SubDataClient client, UUID[] players, String reason, IntConsumer response) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client.sendPacket(new PacketDisconnectPlayer(players, reason, data -> { try { response.accept(data.getInt(0x0001)); diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java index 9ea7d5c6..5eede8b3 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java @@ -131,7 +131,7 @@ public class Server { */ public void command(UUID player, UUID target, String command, IntConsumer response) { Util.nullpo(command, response); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client().sendPacket(new PacketCommandServer(player, target, getName(), command, data -> { try { response.accept(data.getInt(0x0001)); @@ -214,7 +214,7 @@ public class Server { */ public void getRemotePlayers(Consumer> callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); Runnable run = () -> { try { callback.accept(players); diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SimplifiedData.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SimplifiedData.java index 62e9532f..c14f103e 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SimplifiedData.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SimplifiedData.java @@ -29,7 +29,7 @@ public final class SimplifiedData { */ public static void requestHosts(DataClient client, Consumer> callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client(client).sendPacket(new PacketDownloadHostInfo(null, data -> { TreeMap hosts = new TreeMap(); for (String host : data.getKeys()) { @@ -55,7 +55,7 @@ public final class SimplifiedData { */ public static void requestHost(DataClient client, String name, Consumer callback) { Util.nullpo(name, callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client(client).sendPacket(new PacketDownloadHostInfo(Collections.singletonList(name), data -> { Host host = null; if (data.getKeys().size() > 0) { @@ -80,7 +80,7 @@ public final class SimplifiedData { */ public static void requestGroups(DataClient client, Consumer>> callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client(client).sendPacket(new PacketDownloadGroupInfo(null, data -> { TreeMap> groups = new TreeMap>(); for (String group : data.getKeys()) { @@ -131,7 +131,7 @@ public final class SimplifiedData { */ public static void requestGroup(DataClient client, String name, Consumer>> callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client(client).sendPacket(new PacketDownloadGroupInfo((name == null)?Collections.emptyList():Collections.singletonList(name), data -> { Pair> group = null; if (data.getKeys().size() > 0) { @@ -165,7 +165,7 @@ public final class SimplifiedData { */ public static void requestServers(DataClient client, Consumer> callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client(client).sendPacket(new PacketDownloadServerInfo(null, data -> { TreeMap servers = new TreeMap(); for (String server : data.getKeys()) { @@ -195,7 +195,7 @@ public final class SimplifiedData { */ public static void requestServer(DataClient client, String name, Consumer callback) { Util.nullpo(name, callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client(client).sendPacket(new PacketDownloadServerInfo(Collections.singletonList(name), data -> { Server server = null; if (data.getKeys().size() > 0) { @@ -254,7 +254,7 @@ public final class SimplifiedData { */ public static void requestProxies(DataClient client, Consumer> callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client(client).sendPacket(new PacketDownloadProxyInfo(null, data -> { TreeMap proxies = new TreeMap(); for (String proxy : data.getKeys()) { @@ -280,7 +280,7 @@ public final class SimplifiedData { */ public static void requestProxy(DataClient client, String name, Consumer callback) { Util.nullpo(name, callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client(client).sendPacket(new PacketDownloadProxyInfo(Collections.singletonList(name), data -> { Proxy proxy = null; if (data.getKeys().size() > 0) { @@ -305,7 +305,7 @@ public final class SimplifiedData { */ public static void requestMasterProxy(DataClient client, Consumer callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client(client).sendPacket(new PacketDownloadProxyInfo(Collections.emptyList(), data -> { Proxy proxy = null; if (data.getKeys().size() > 0) { @@ -330,7 +330,7 @@ public final class SimplifiedData { */ public static void requestRemotePlayers(DataClient client, Consumer> callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client(client).sendPacket(new PacketDownloadPlayerInfo((List) null, data -> { TreeMap players = new TreeMap(); for (String player : data.getKeys()) { @@ -356,7 +356,7 @@ public final class SimplifiedData { */ public static void requestRemotePlayer(DataClient client, String name, Consumer callback) { Util.nullpo(name, callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client(client).sendPacket(new PacketDownloadPlayerInfo(Collections.singletonList(name), data -> { RemotePlayer player = null; if (data.getKeys().size() > 0) { @@ -382,7 +382,7 @@ public final class SimplifiedData { */ public static void requestRemotePlayer(DataClient client, UUID id, Consumer callback) { Util.nullpo(id, callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client(client).sendPacket(new PacketDownloadPlayerInfo(Collections.singletonList(id), data -> { RemotePlayer player = null; if (data.getKeys().size() > 0) { diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubCreator.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubCreator.java index e8bee276..87ee88fb 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubCreator.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubCreator.java @@ -135,7 +135,7 @@ public class SubCreator { */ public void create(UUID player, String name, ServerTemplate template, Version version, Integer port, IntConsumer response) { Util.nullpo(response); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); ((SubDataClient) ClientAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketCreateServer(player, name, host.getName(), template.getName(), version, port, data -> { try { response.accept(data.getInt(0x0001)); @@ -196,7 +196,7 @@ public class SubCreator { */ public void update(UUID player, SubServer server, ServerTemplate template, Version version, IntConsumer response) { Util.nullpo(response); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); ((SubDataClient) ClientAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketUpdateServer(player, server.getName(), template.getName(), version, data -> { try { response.accept(data.getInt(0x0001)); diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubServer.java index 30074735..66c7fcf3 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubServer.java @@ -91,7 +91,7 @@ public class SubServer extends Server { */ public void start(UUID player, IntConsumer response) { Util.nullpo(response); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client().sendPacket(new PacketStartServer(player, getName(), data -> { try { response.accept(data.getInt(0x0001)); @@ -136,7 +136,7 @@ public class SubServer extends Server { */ public void stop(UUID player, IntConsumer response) { Util.nullpo(response); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client().sendPacket(new PacketStopServer(player, getName(), false, data -> { try { response.accept(data.getInt(0x0001)); @@ -181,7 +181,7 @@ public class SubServer extends Server { */ public void terminate(UUID player, IntConsumer response) { Util.nullpo(response); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client().sendPacket(new PacketStopServer(player, getName(), true, data -> { try { response.accept(data.getInt(0x0001)); @@ -300,7 +300,7 @@ public class SubServer extends Server { private void edit(UUID player, ObjectMap edit, boolean perma, IntConsumer response) { Util.nullpo(response); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); client().sendPacket(new PacketEditServer(player, getName(), edit, perma, data -> { try { if (data.getInt(0x0001) != 0) { @@ -351,7 +351,7 @@ public class SubServer extends Server { */ public void getHost(Consumer callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); Runnable run = () -> { try { callback.accept(host); @@ -627,7 +627,7 @@ public class SubServer extends Server { */ public void getIncompatibilities(Consumer> callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); Runnable run = () -> { try { callback.accept(incompatibilities); @@ -671,7 +671,7 @@ public class SubServer extends Server { */ public void getCurrentIncompatibilities(Consumer> callback) { Util.nullpo(callback); - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); Runnable run = () -> { try { callback.accept(currentIncompatibilities); diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Compatibility/ChatColor.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Compatibility/ChatColor.java index f2c09b9c..27f56606 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Compatibility/ChatColor.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/Compatibility/ChatColor.java @@ -7,9 +7,7 @@ import org.spongepowered.api.text.format.TextStyle; import org.spongepowered.api.text.format.TextStyles; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; -import java.util.LinkedList; import java.util.regex.Pattern; /** @@ -127,16 +125,15 @@ public enum ChatColor { } if (str.contains(Character.toString(character))) { - LinkedList pieces = new LinkedList(Arrays.asList(str.split(Pattern.quote(Character.toString(character))))); - Collections.reverse(pieces); + String[] pieces = str.split(Pattern.quote(Character.toString(character))); + String piece; Text result = null; - int i = pieces.size(); - for (String piece : pieces) { - i--; - Text.Builder current; + Text.Builder current; + for (int i = pieces.length; i > 0;) { + piece = pieces[--i]; if (i > 0 && piece.length() > 0) { - if (map.keySet().contains(piece.toCharArray()[0])) { + if (map.containsKey(piece.toCharArray()[0])) { current = Text.builder(piece.substring(1)); ChatColor color = map.get(piece.toCharArray()[0]); current.style(color.getStyles()); diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java index 6b4761c0..e1ae38b8 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java @@ -1346,7 +1346,7 @@ public final class SubCommand implements CommandExecutor { } @SuppressWarnings("unchecked") private void selectServers(CommandSource sender, String[] selection, boolean mode, String[][] permissions, Consumer callback) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); LinkedList msgs = new LinkedList(); LinkedList select = new LinkedList(); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java index bc41490a..a2536ac7 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java @@ -982,7 +982,7 @@ public class SubCommand { } private void selectServers(CommandSender sender, String[] rargs, int index, boolean mode, Consumer callback) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); LinkedList msgs = new LinkedList(); LinkedList args = new LinkedList(); LinkedList selection = new LinkedList(); diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java index 63f29d97..98c7b32f 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java @@ -735,7 +735,7 @@ public final class SubCommand extends Command implements TabExecutor { } private void selectServers(CommandSender sender, String[] rargs, int index, boolean mode, Consumer callback) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); LinkedList msgs = new LinkedList(); LinkedList args = new LinkedList(); LinkedList selection = new LinkedList(); diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubCommand.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubCommand.java index 0dfd657c..e509c92e 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubCommand.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubCommand.java @@ -740,7 +740,7 @@ public final class SubCommand implements SimpleCommand { } private void selectServers(CommandSource sender, String[] rargs, int index, boolean mode, Consumer callback) { - StackTraceElement[] origin = new Exception().getStackTrace(); + StackTraceElement[] origin = new Throwable().getStackTrace(); LinkedList msgs = new LinkedList(); LinkedList args = new LinkedList(); LinkedList selection = new LinkedList();