From 61fff5ba08c37062f4fe8b0e1b58e2d69687770b Mon Sep 17 00:00:00 2001 From: yoyosource Date: Sun, 26 Jun 2022 16:17:44 +0200 Subject: [PATCH] Hotfix TpCommand --- src/de/steamwar/bungeecore/commands/TpCommand.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/de/steamwar/bungeecore/commands/TpCommand.java b/src/de/steamwar/bungeecore/commands/TpCommand.java index 3961f8cd..b0e98039 100644 --- a/src/de/steamwar/bungeecore/commands/TpCommand.java +++ b/src/de/steamwar/bungeecore/commands/TpCommand.java @@ -52,10 +52,14 @@ public class TpCommand extends BasicCommand { return; } - ServerInfo server = getTarget(player, args[0]); + ServerInfo server = getTarget(args[0]); - //Give control of teleport command to server if(server == null) { + ChatSender.of(player).system("JOIN_PLAYER_BLOCK"); + return; + } + //Give control of teleport command to server + if (server == player.getReconnectServer()) { Chat19.chat(player, "/tp " + String.join(" ", args)); return; } @@ -110,7 +114,7 @@ public class TpCommand extends BasicCommand { } } - private static ServerInfo getTarget(ProxiedPlayer player, String arg) { + private static ServerInfo getTarget(String arg) { ServerInfo server = null; //Get target player server @@ -128,9 +132,6 @@ public class TpCommand extends BasicCommand { } } - if(server == player.getServer().getInfo()) - server = null; - return server; } }