diff --git a/war/src/main/java/bukkit/tommytony/war/War.java b/war/src/main/java/bukkit/tommytony/war/War.java index 53c93a6..5d01e86 100644 --- a/war/src/main/java/bukkit/tommytony/war/War.java +++ b/war/src/main/java/bukkit/tommytony/war/War.java @@ -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();