From cbf11a704e27098ee3842ad8db36df2c27a1b3b4 Mon Sep 17 00:00:00 2001 From: TimWolla Date: Fri, 8 Jul 2011 22:43:37 +0200 Subject: [PATCH] Reset the inventory on zone delete --- war/src/main/java/bukkit/tommytony/war/War.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/war/src/main/java/bukkit/tommytony/war/War.java b/war/src/main/java/bukkit/tommytony/war/War.java index 650fbeb..a6325a6 100644 --- a/war/src/main/java/bukkit/tommytony/war/War.java +++ b/war/src/main/java/bukkit/tommytony/war/War.java @@ -588,14 +588,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();