Signed-off-by: Lixfel <agga-games@gmx.de>
Dieser Commit ist enthalten in:
Ursprung
d5c6c7892e
Commit
cfd72d099d
1
.gitmodules
vendored
1
.gitmodules
vendored
@ -1,3 +1,4 @@
|
|||||||
[submodule "CommonCore"]
|
[submodule "CommonCore"]
|
||||||
path = CommonCore
|
path = CommonCore
|
||||||
url = https://steamwar.de/devlabs/SteamWar/CommonCore.git
|
url = https://steamwar.de/devlabs/SteamWar/CommonCore.git
|
||||||
|
branch = master
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit e83103d8afce8161a12d008d6ad99ba439243b27
|
Subproject commit 0f03b57e437c1d843816b7202d95b79ff0a8d2df
|
@ -86,16 +86,14 @@ public class TpCommand extends BasicCommand {
|
|||||||
} else if(subserver instanceof Bauserver) {
|
} else if(subserver instanceof Bauserver) {
|
||||||
Bauserver bauserver = (Bauserver) subserver;
|
Bauserver bauserver = (Bauserver) subserver;
|
||||||
ProxiedPlayer checker = BungeeCord.getInstance().getPlayer(bauserver.getOwner());
|
ProxiedPlayer checker = BungeeCord.getInstance().getPlayer(bauserver.getOwner());
|
||||||
if (CheckCommand.isChecking(checker)) {
|
if (checker != null && CheckCommand.isChecking(checker)) {
|
||||||
SteamwarUser steamwarUser = SteamwarUser.get(player);
|
SteamwarUser steamwarUser = SteamwarUser.get(player);
|
||||||
if (steamwarUser.getUserGroup().isCheckSchematics() || CheckCommand.getCheckingSchem(checker).getOwner() == steamwarUser.getId()) {
|
if (steamwarUser.getUserGroup().isCheckSchematics() || CheckCommand.getCheckingSchem(checker).getOwner() == steamwarUser.getId()) {
|
||||||
SubserverSystem.sendPlayer(subserver, player);
|
SubserverSystem.sendPlayer(subserver, player);
|
||||||
return;
|
} else {
|
||||||
}
|
|
||||||
sender.system("JOIN_PLAYER_BLOCK");
|
sender.system("JOIN_PLAYER_BLOCK");
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
if (bauserver.getOwner().equals(player.getUniqueId()) || BauweltMember.getBauMember(bauserver.getOwner(), player.getUniqueId()) != null) {
|
} else if (bauserver.getOwner().equals(player.getUniqueId()) || BauweltMember.getBauMember(bauserver.getOwner(), player.getUniqueId()) != null) {
|
||||||
SubserverSystem.sendPlayer(subserver, player);
|
SubserverSystem.sendPlayer(subserver, player);
|
||||||
} else {
|
} else {
|
||||||
SubserverSystem.sendDeniedMessage(player, bauserver.getOwner());
|
SubserverSystem.sendDeniedMessage(player, bauserver.getOwner());
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren