Not sure how this went this long un-fixed.

Signed-off-by: Mike Howe <mike@mcsnetworks.com>
spoutcraft · May 13, 2014 · 222a9ea · 222a9ea
1 parent 1c143b9
commit 222a9ea
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/src/main/java/org/getspout/spout/SpoutWorldMonitorListener.java b/src/main/java/org/getspout/spout/SpoutWorldMonitorListener.java
@@ -37,11 +37,8 @@ public SpoutWorldMonitorListener(Spout plugin) {
 
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onChunkUnload(ChunkUnloadEvent event) {
-		if (event.isCancelled()) {
-			return;
-		}
 		SimpleChunkDataManager dm = (SimpleChunkDataManager)SpoutManager.getChunkDataManager();
-		dm.saveChunk(event.getChunk());
+		dm.saveChunk(event.getChunk(), true);
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR)
@@ -52,9 +49,6 @@ public void onWorldSave(WorldSaveEvent event) {
 
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onWorldUnload(WorldUnloadEvent event) {
-		if (event.isCancelled()) {
-			return;
-		}
 		SimpleChunkDataManager dm = (SimpleChunkDataManager)SpoutManager.getChunkDataManager();
 		dm.unloadWorldChunks(event.getWorld());
 	}

diff --git a/src/main/java/org/getspout/spout/listeners/SpoutWorldListener.java b/src/main/java/org/getspout/spout/listeners/SpoutWorldListener.java
@@ -27,7 +27,6 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.ChunkEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
-import org.bukkit.event.world.ChunkUnloadEvent;
 import org.bukkit.event.world.WorldLoadEvent;
 import org.getspout.spout.Spout;
 
@@ -56,13 +55,7 @@ public void onChunkLoad(ChunkLoadEvent event) {
 			dm.loadChunk(event.getChunk());
 		}
 	}
-
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void onChunkUnload(ChunkUnloadEvent event) {
-			SimpleChunkDataManager dm = (SimpleChunkDataManager)SpoutManager.getChunkDataManager();
-			dm.saveChunk(event.getWorld(), event.getChunk().getX(), event.getChunk().getZ(), true);
-	}
-
+
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onWorldLoad(WorldLoadEvent event) {
 		SimpleChunkDataManager dm = (SimpleChunkDataManager)SpoutManager.getChunkDataManager();

diff --git a/src/main/java/org/getspout/spoutapi/chunkstore/SimpleChunkDataManager.java b/src/main/java/org/getspout/spoutapi/chunkstore/SimpleChunkDataManager.java
@@ -83,10 +83,13 @@ public boolean loadAllChunks() {
 	public boolean saveChunk(Chunk c) {
 		return saveChunk(c.getWorld(), c.getX(), c.getZ());
 	}
+
+	public boolean saveChunk(Chunk c, boolean remove) {
+		return saveChunk(c.getWorld(), c.getX(), c.getZ(), remove);
+	}
 
 	public boolean saveChunk(World w, int x, int z) {
 		ChunkMetaData md = getMetaData(w, x, z, false, false);
-
 		if (md != null) {
 			chunkStore.writeChunkMetaData(w, x, z, md);
 			return true;