Merge pull request 'Improve TpCommand for current checking players' (#356) from ImproveChecking into master

Reviewed-on: SteamWar/BungeeCore#356
Reviewed-by: Lixfel <lixfel@steamwar.de>

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "CommonCore"]
 	path = CommonCore
 	url = https://steamwar.de/devlabs/SteamWar/CommonCore.git
+	branch = master

CommonCore

@@ -1 +1 @@
-Subproject commit e83103d8afce8161a12d008d6ad99ba439243b27
+Subproject commit 0f03b57e437c1d843816b7202d95b79ff0a8d2df

src/de/steamwar/bungeecore/commands/CheckCommand.java

@@ -58,6 +58,10 @@ public class CheckCommand extends BasicCommand {
         return currentCheckers.containsKey(player.getUniqueId());
     }
 
+    public static SchematicNode getCheckingSchem(ProxiedPlayer player) {
+        return currentCheckers.get(player.getUniqueId()).schematic;
+    }
+
     public CheckCommand() {
         super("check", ConnectionListener.CHECK_PERMISSION);
 

src/de/steamwar/bungeecore/commands/TpCommand.java

@@ -20,11 +20,9 @@
 package de.steamwar.bungeecore.commands;
 
 import de.steamwar.bungeecore.*;
-import de.steamwar.bungeecore.sql.BauweltMember;
+import de.steamwar.bungeecore.sql.*;
-import de.steamwar.bungeecore.sql.Event;
-import de.steamwar.bungeecore.sql.Punishment;
-import de.steamwar.bungeecore.sql.Team;
 import de.steamwar.messages.ChatSender;
+import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.config.ServerInfo;
@@ -87,7 +85,15 @@ public class TpCommand extends BasicCommand {
 
         } else if(subserver instanceof Bauserver) {
             Bauserver bauserver = (Bauserver) subserver;
-            if (bauserver.getOwner().equals(player.getUniqueId()) || BauweltMember.getBauMember(bauserver.getOwner(), player.getUniqueId()) != null) {
+            ProxiedPlayer checker = BungeeCord.getInstance().getPlayer(bauserver.getOwner());
+            if (checker != null && CheckCommand.isChecking(checker)) {
+                SteamwarUser steamwarUser = SteamwarUser.get(player);
+                if (steamwarUser.getUserGroup().isCheckSchematics() || CheckCommand.getCheckingSchem(checker).getOwner() == steamwarUser.getId()) {
+                    SubserverSystem.sendPlayer(subserver, player);
+                } else {
+                    sender.system("JOIN_PLAYER_BLOCK");
+                }
+            } else if (bauserver.getOwner().equals(player.getUniqueId()) || BauweltMember.getBauMember(bauserver.getOwner(), player.getUniqueId()) != null) {
                 SubserverSystem.sendPlayer(subserver, player);
             } else {
                 SubserverSystem.sendDeniedMessage(player, bauserver.getOwner());