From 305b2454c769becd3577853afd4861d61e54f59b Mon Sep 17 00:00:00 2001
From: taoneill <thomasantoine.oneill@gmail.com>
Date: Fri, 6 Apr 2012 22:19:44 -0400
Subject: [PATCH] Closes gh-406. The inventory reset fix seems to not have
 broken anything important - good. Fixed lobby disappearing with new /teamcfg
 and /zonecfg that dont reset the zone anymore.

---
 war/src/main/java/com/tommytony/war/Warzone.java             | 5 ++++-
 .../java/com/tommytony/war/command/RenameZoneCommand.java    | 4 +---
 .../java/com/tommytony/war/command/ResetZoneCommand.java     | 4 +---
 .../java/com/tommytony/war/command/SetTeamConfigCommand.java | 3 ---
 .../java/com/tommytony/war/command/SetZoneConfigCommand.java | 3 ---
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/war/src/main/java/com/tommytony/war/Warzone.java b/war/src/main/java/com/tommytony/war/Warzone.java
index 2207c6a..222ffdf 100644
--- a/war/src/main/java/com/tommytony/war/Warzone.java
+++ b/war/src/main/java/com/tommytony/war/Warzone.java
@@ -284,6 +284,9 @@ public class Warzone {
 
 		// reset lobby (here be demons)
 		if (this.lobby != null) {
+			if (this.lobby.getVolume() != null) {
+				this.lobby.getVolume().resetBlocks();
+			}
 			this.lobby.initialize();
 		}
 
@@ -880,7 +883,7 @@ public class Warzone {
 						}
 	
 						this.handleScoreCapReached(player, winnersStr);
-						// player.teleport(playerWarzone.getTeleport());
+
 						// player will die because it took too long :(
 						// we dont restore his inventory in handleScoreCapReached
 						// check out PLAYER_MOVE for the rest of the fix
diff --git a/war/src/main/java/com/tommytony/war/command/RenameZoneCommand.java b/war/src/main/java/com/tommytony/war/command/RenameZoneCommand.java
index 140a104..8a5383c 100644
--- a/war/src/main/java/com/tommytony/war/command/RenameZoneCommand.java
+++ b/war/src/main/java/com/tommytony/war/command/RenameZoneCommand.java
@@ -78,9 +78,7 @@ public class RenameZoneCommand extends AbstractZoneMakerCommand {
 		War.war.getWarzones().add(newZone);
 		// zone.getVolume().loadCorners();
 		newZone.getVolume().loadCorners();
-		if (newZone.getLobby() != null) {
-			newZone.getLobby().getVolume().resetBlocks();
-		}
+		
 		if (newZone.getWarzoneConfig().getBoolean(WarzoneConfig.RESETONLOAD)) {
 			newZone.getVolume().resetBlocks();
 		}
diff --git a/war/src/main/java/com/tommytony/war/command/ResetZoneCommand.java b/war/src/main/java/com/tommytony/war/command/ResetZoneCommand.java
index 60df598..ca616b6 100644
--- a/war/src/main/java/com/tommytony/war/command/ResetZoneCommand.java
+++ b/war/src/main/java/com/tommytony/war/command/ResetZoneCommand.java
@@ -54,9 +54,7 @@ public class ResetZoneCommand extends AbstractZoneMakerCommand {
 		}
 
 		this.msg("Reloading warzone " + zone.getName() + ".");
-		if (zone.getLobby() != null) {
-			zone.getLobby().getVolume().resetBlocksAsJob();
-		}
+		
 		zone.reinitialize();
 
 		return true;
diff --git a/war/src/main/java/com/tommytony/war/command/SetTeamConfigCommand.java b/war/src/main/java/com/tommytony/war/command/SetTeamConfigCommand.java
index 99c1db3..7fa0ce5 100644
--- a/war/src/main/java/com/tommytony/war/command/SetTeamConfigCommand.java
+++ b/war/src/main/java/com/tommytony/war/command/SetTeamConfigCommand.java
@@ -134,9 +134,6 @@ public class SetTeamConfigCommand extends AbstractZoneMakerCommand {
 			if (!namedParamReturn.equals("") && !namedParamReturn.equals("PARSE-ERROR")) {
 				
 				WarzoneYmlMapper.save(zone, false);
-				if (zone.getLobby() != null) {
-					zone.getLobby().getVolume().resetBlocks();
-				}
 				
 				String zoneReset = "Some changes may require a /resetzone. "; 
 				if (zone.getWarzoneConfig().getBoolean(WarzoneConfig.RESETONCONFIGCHANGE)) {
diff --git a/war/src/main/java/com/tommytony/war/command/SetZoneConfigCommand.java b/war/src/main/java/com/tommytony/war/command/SetZoneConfigCommand.java
index 4b82a88..10a8b8b 100644
--- a/war/src/main/java/com/tommytony/war/command/SetZoneConfigCommand.java
+++ b/war/src/main/java/com/tommytony/war/command/SetZoneConfigCommand.java
@@ -95,9 +95,6 @@ public class SetZoneConfigCommand extends AbstractZoneMakerCommand {
 			if (!namedParamReturn.equals("") && !namedParamReturn.equals("PARSE-ERROR")) {
 
 				WarzoneYmlMapper.save(zone, false);
-				if (zone.getLobby() != null) {
-					zone.getLobby().getVolume().resetBlocks();
-				}
 				
 				String zoneReset = "Some changes may require a /resetzone. "; 
 				if (zone.getWarzoneConfig().getBoolean(WarzoneConfig.RESETONCONFIGCHANGE)) {