Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-11-27 12:46:11 +01:00
Code Issues Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Tim Düsterhus 2011-07-27 22:23:10 +02:00
parent 84d4f35c2f
commit bc77ce5892
3 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
war/src/main/java/bukkit/tommytony/war/War.java
View File

@ -327,39 +327,6 @@ public class War extends JavaPlugin {
}
}
public void performDeleteTeam(Player player, String[] arguments) {
if (arguments.length < 1 || (!this.inAnyWarzone(player.getLocation()) && !this.inAnyWarzoneLobby(player.getLocation()))) {
this.badMsg(player, "Usage: /deleteteam <team-name/color>." + " Deletes the team and its spawn. " + "Must be in a warzone or lobby (try /zones and /zone). ");
} else {
String name = arguments[0];
Warzone warzone = Warzone.getZoneByLocation(player);
ZoneLobby lobby = ZoneLobby.getLobbyByLocation(player);
if (warzone == null && lobby != null) {
warzone = lobby.getZone();
} else {
lobby = warzone.getLobby();
}
Team team = warzone.getTeamByKind(TeamKinds.teamKindFromString(name));
if (team != null) {
if (team.getFlagVolume() != null) {
team.getFlagVolume().resetBlocks();
}
team.getSpawnVolume().resetBlocks();
warzone.getTeams().remove(team);
if (warzone.getLobby() != null) {
warzone.getLobby().getVolume().resetBlocks();
// warzone.getVolume().resetWallBlocks(warzone.getLobby().getWall());
// warzone.addZoneOutline(warzone.getLobby().getWall());
warzone.getLobby().initialize();
}
WarzoneMapper.save(warzone, false);
this.msg(player, "Team " + team.getName() + " removed.");
} else {
this.badMsg(player, "No such team.");
}
}
}
public void performSetTeamFlag(Player player, String[] arguments) {
if (arguments.length < 1 || !this.inAnyWarzone(player.getLocation()) || (arguments.length > 0 && TeamKinds.teamKindFromString(arguments[0]) == null)) {
this.badMsg(player, "Usage: /setteamflag <team-name/color>, e.g. /setteamflag diamond. " + "Sets the team flag post to the current location. " + "Must be in a warzone (try /zones and /zone). ");

5
war/src/main/java/bukkit/tommytony/war/command/DeletemonumentCommand.java
View File

@ -18,7 +18,10 @@ public class DeletemonumentCommand extends AbstractZoneMakerCommand {
@Override
public boolean handle() {
Warzone zone;
if (this.args.length == 1) {
if (this.args.length == 0) {
return false;
}
else if (this.args.length == 2) {
zone = Warzone.getZoneByName(this.args[0]);
this.args[0] = this.args[1];
} else {

5
war/src/main/java/bukkit/tommytony/war/command/DeleteteamCommand.java
View File

@ -19,7 +19,10 @@ public class DeleteteamCommand extends AbstractZoneMakerCommand {
@Override
public boolean handle() {
Warzone zone;
if (this.args.length == 1) {
if (this.args.length == 0) {
return false;
}
else if (this.args.length == 2) {
zone = Warzone.getZoneByName(this.args[0]);
this.args[0] = this.args[1];
} else {