geforkt von SteamWar/BungeeCore
Adjust config for new fight system
Signed-off-by: Lixfel <agga-games@gmx.de>
Dieser Commit ist enthalten in:
Ursprung
a079b25c14
Commit
5424a739d9
@ -107,10 +107,6 @@ public class ArenaMode {
|
|||||||
byCheckSchemType.put(this.schemType, this);
|
byCheckSchemType.put(this.schemType, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getInternalName() {
|
|
||||||
return internalName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getDisplayName() {
|
public String getDisplayName() {
|
||||||
return displayName;
|
return displayName;
|
||||||
}
|
}
|
||||||
@ -143,8 +139,8 @@ public class ArenaMode {
|
|||||||
return chatNames.get(0);
|
return chatNames.get(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasChatName(){
|
public boolean withoutChatName(){
|
||||||
return !chatNames.isEmpty();
|
return chatNames.isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isHistoric(){
|
public boolean isHistoric(){
|
||||||
|
@ -108,7 +108,7 @@ public class SubserverSystem {
|
|||||||
|
|
||||||
//Copy world
|
//Copy world
|
||||||
try {
|
try {
|
||||||
new ProcessBuilder("cp", "-r", SERVER_PATH + modus.getFolder() + "/" + map, worldDir + mapName).start().waitFor();
|
new ProcessBuilder("cp", "-r", SERVER_PATH + modus.getFolder() + "/arenas/" + map, worldDir + mapName).start().waitFor();
|
||||||
} catch (IOException | InterruptedException e) {
|
} catch (IOException | InterruptedException e) {
|
||||||
throw new SecurityException("Could not copy folder", e);
|
throw new SecurityException("Could not copy folder", e);
|
||||||
}
|
}
|
||||||
@ -128,7 +128,7 @@ public class SubserverSystem {
|
|||||||
|
|
||||||
//Start server
|
//Start server
|
||||||
ProcessBuilder process = new ProcessBuilder(cmd);
|
ProcessBuilder process = new ProcessBuilder(cmd);
|
||||||
process.directory(new File(SERVER_PATH, modus.getInternalName()));
|
process.directory(new File(SERVER_PATH, modus.getFolder()));
|
||||||
|
|
||||||
String finalMapName = mapName;
|
String finalMapName = mapName;
|
||||||
if(eventFightID == -1)
|
if(eventFightID == -1)
|
||||||
|
@ -69,7 +69,7 @@ public class FightCommand extends BasicCommand {
|
|||||||
TextComponent start = new TextComponent();
|
TextComponent start = new TextComponent();
|
||||||
TextComponent current = start;
|
TextComponent current = start;
|
||||||
for(ArenaMode mode : ArenaMode.getAllModes()){
|
for(ArenaMode mode : ArenaMode.getAllModes()){
|
||||||
if(!mode.hasChatName() || mode.isHistoric() != historic)
|
if(mode.withoutChatName() || mode.isHistoric() != historic)
|
||||||
continue;
|
continue;
|
||||||
String command = precommand + mode.getChatName();
|
String command = precommand + mode.getChatName();
|
||||||
current.setBold(true);
|
current.setBold(true);
|
||||||
|
@ -81,7 +81,7 @@ public class RankedCommand extends BasicCommand {
|
|||||||
TextComponent start = new TextComponent();
|
TextComponent start = new TextComponent();
|
||||||
TextComponent current = start;
|
TextComponent current = start;
|
||||||
for(ArenaMode mode : ArenaMode.getAllModes()){
|
for(ArenaMode mode : ArenaMode.getAllModes()){
|
||||||
if(!mode.hasChatName() || !mode.isRanked())
|
if(mode.withoutChatName() || !mode.isRanked())
|
||||||
continue;
|
continue;
|
||||||
String command = precommand + mode.getChatName();
|
String command = precommand + mode.getChatName();
|
||||||
current.setBold(true);
|
current.setBold(true);
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren