SteamWar/BungeeCore
Archiviert
13
2

Adding full 1.15 support

Dieser Commit ist enthalten in:
Lixfel 2020-02-16 19:27:15 +01:00
Ursprung b63d428de5
Commit c6f23876e3

Datei anzeigen

@ -30,6 +30,7 @@ public class BauCommand {
switch(command[1].toLowerCase()){ switch(command[1].toLowerCase()){
case "15": case "15":
case "1.15":
SubserverSystem.sendToBau15(p, p.getUniqueId()); SubserverSystem.sendToBau15(p, p.getUniqueId());
break; break;
case "addmember": case "addmember":
@ -62,7 +63,7 @@ public class BauCommand {
break; break;
case "resetall": case "resetall":
case "delete": case "delete":
delete(p); delete(p, command);
break; break;
case "testarena": case "testarena":
case "test": case "test":
@ -111,7 +112,11 @@ public class BauCommand {
BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cDu darfst dich nicht auf diese Welt teleportieren"); BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cDu darfst dich nicht auf diese Welt teleportieren");
return; return;
} }
SubserverSystem.sendToBauServer(p, worldOwner.getUuid());
if(command.length > 3 && command[3].equals("1.15"))
SubserverSystem.sendToBau15(p, worldOwner.getUuid());
else
SubserverSystem.sendToBauServer(p, worldOwner.getUuid());
} }
private static void togglebuild(ProxiedPlayer p, String[] command){ private static void togglebuild(ProxiedPlayer p, String[] command){
@ -162,18 +167,38 @@ public class BauCommand {
BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cDer Spieler wurde entfernt."); BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cDer Spieler wurde entfernt.");
} }
private static void delete(ProxiedPlayer p){ private static void delete(ProxiedPlayer p, String[] command){
BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§aDeine Welt wird zurückgesetzt."); if(command.length > 2){
ProxyServer.getInstance().getScheduler().runAsync(BungeeCore.get(), () -> { if(!command[2].equals("1.15")){
for (Subserver subserver : Subserver.getServerList()) { BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§c Unbekannte Option: " + command[2]);
if (subserver.getType() == Servertype.BAUSERVER && ((Bauserver) subserver).getOwner().equals(p.getUniqueId())) { return;
subserver.stop();
break;
}
} }
File directory = new File(BungeeCore.WORLD_FOLDER + p.getUniqueId().toString());
del(directory); BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§aDeine Welt wird zurückgesetzt.");
}); ProxyServer.getInstance().getScheduler().runAsync(BungeeCore.get(), () -> {
for (Subserver subserver : Subserver.getServerList()) {
if (subserver.getType() == Servertype.BAUSERVER && ((Bauserver) subserver).getOwner().equals(p.getUniqueId())) {
subserver.stop();
break;
}
}
SteamwarUser user = SteamwarUser.get(p.getUniqueId());
File directory = new File(BungeeCore.USERWORLDS15 + user.getId());
del(directory);
});
}else{
BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§aDeine Welt wird zurückgesetzt.");
ProxyServer.getInstance().getScheduler().runAsync(BungeeCore.get(), () -> {
for (Subserver subserver : Subserver.getServerList()) {
if (subserver.getType() == Servertype.BAUSERVER && ((Bauserver) subserver).getOwner().equals(p.getUniqueId())) {
subserver.stop();
break;
}
}
File directory = new File(BungeeCore.WORLD_FOLDER + p.getUniqueId().toString());
del(directory);
});
}
} }
private static void testarena(ProxiedPlayer p, String[] command){ private static void testarena(ProxiedPlayer p, String[] command){