Upstream
/
war
mirror of https://github.com/taoneill/war.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #750, rotate lobbies

This commit is contained in:
Connor Monahan 2017-07-20 00:29:33 -04:00
parent 9c3c43c4f6
commit b772b71803
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
war/src/main/java/com/tommytony/war/command/SetZoneLobbyCommand.java
View File

@ -34,11 +34,12 @@ public class SetZoneLobbyCommand extends AbstractZoneMakerCommand {
return false;
}
Player player = (Player) this.getSender();
ZoneLobby origLobby = null;
Warzone zone = Warzone.getZoneByLocation((Player) this.getSender());
if (zone == null) {
ZoneLobby lobby = ZoneLobby.getLobbyByLocation((Player) this.getSender());
if (lobby != null) {
zone = lobby.getZone();
origLobby = ZoneLobby.getLobbyByLocation((Player) this.getSender());
if (origLobby != null) {
zone = origLobby.getZone();
}
}
@ -75,6 +76,12 @@ public class SetZoneLobbyCommand extends AbstractZoneMakerCommand {
} else {
// Inside a warzone: use the classic n/s/e/w mode
if (!this.args[0].equals("north") && !this.args[0].equals("n") && !this.args[0].equals("east") && !this.args[0].equals("e") && !this.args[0].equals("south") && !this.args[0].equals("s") && !this.args[0].equals("west") && !this.args[0].equals("w")) {
if (Warzone.getZoneByName(this.args[0]) == zone && origLobby != null) {
origLobby.setLocation(player.getLocation());
origLobby.initialize();
this.msg("Warzone lobby moved to your location.");
return true;
}
return false;
}
ZoneLobby lobby = zone.getLobby();