Merge remote branch 'Evil-Code/resetInventoryOnZoneDelete' into tim

This commit is contained in:
taoneill 2011-07-14 19:52:39 -04:00
commit f211d43689

View File

@ -577,14 +577,21 @@ public class War extends JavaPlugin {
warzone = this.warzone(player.getLocation());
lobby = this.lobby(player.getLocation());
}
if(warzone == null && lobby != null) {
warzone = lobby.getZone();
} else {
lobby = warzone.getLobby();
}
for(Team t : warzone.getTeams()) {
if(t.getTeamFlag() != null) t.getFlagVolume().resetBlocks();
t.getSpawnVolume().resetBlocks();
// reset inventory
for(Player p : t.getPlayers()) {
warzone.restorePlayerInventory(p);
}
}
for(Monument m : warzone.getMonuments()) {
m.getVolume().resetBlocks();