skywalker3200/MobArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make spec warp mandatory.

Browse Source 
This is necessary to ensure a robust /ma spec command. If no spectator
warp is set, the command will throw an NPE - it is much more safe and
sane to require the warp.
This commit is contained in:
garbagemule
2013-09-21 15:27:41 +02:00
parent 096c4d4367
commit 451e39e3b7
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/garbagemule/MobArena/commands/setup/SetupCommand.java
+2 -8
View File
@@ -135,16 +135,10 @@ public class SetupCommand implements Command, Listener {
missing.add("p2"); missing.add("p2");
} }
// Arena and lobby warps // Arena, lobby, and spectator warps
if (region.getArenaWarp() == null) missing.add("arena"); if (region.getArenaWarp() == null) missing.add("arena");
if (region.getLobbyWarp() == null) missing.add("lobby"); if (region.getLobbyWarp() == null) missing.add("lobby");
if (region.getSpecWarp() == null) missing.add("spectator");
// Conditionally optional spectator warp
if (arena.getSettings().getBoolean("spectate-on-death", true)) {
if (region.getSpecWarp() == null) {
missing.add("spectator");
}
}
// Spawnpoints // Spawnpoints
if (region.getSpawnpoints().isEmpty()) { if (region.getSpawnpoints().isEmpty()) {