Fix world holes.

MrSmith33 · Jan 1, 2015 · 4513767 · 4513767
1 parent 0ca63a7
commit 4513767
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/source/modular/modules/eventdispatchermodule.d b/source/modular/modules/eventdispatchermodule.d
@@ -11,7 +11,7 @@ abstract class Event
 private alias EventHandler = void delegate(Event event);
 
 /// Event 
-class EventDispatcherModule : IModule, IEventDispatcherModule
+class EventDispatcherModule : IModule
 {
 	override string name() @property { return "EventDispatcherModule"; }
 	override string semver() @property { return "1.0.0"; }

diff --git a/source/voxelman/chunkman.d b/source/voxelman/chunkman.d
@@ -87,6 +87,7 @@ struct ChunkMan
 			storeWorker.stopWorkersWhenDone();
 
 		thread_joinAll();
+
 	}
 
 	void update()
@@ -113,22 +114,23 @@ struct ChunkMan
 		chunk.hasWriter = false;
 		chunk.isLoaded = true;
 
+		assert(!chunk.isUsed);
+
 		++totalLoadedChunks;
 		--numLoadChunkTasks;
 
-		if (chunk.isMarkedForDeletion)
-		{
-			delete data;
-			return;
-		}
-
 		chunk.isVisible = true;
 		if (data.chunkData.uniform)
 		{
 			chunk.isVisible = blockMan.blocks[data.chunkData.uniformType].isVisible;
 		}
 		chunk.data = data.chunkData;
 
+		if (chunk.isMarkedForDeletion)
+		{
+			return;
+		}
+
 		if (chunk.isVisible)
 			tryMeshChunk(chunk);
 		foreach(a; chunk.adjacent)

diff --git a/source/voxelman/storageworker.d b/source/voxelman/storageworker.d
@@ -64,6 +64,7 @@ void storageWorkerThread(Tid mainTid, string regionDir)
 		while (isRunningLocal)
 		{
 			receive(
+				// read
 				(ivec3 chunkPos, Tid genWorker) {
 					if (!atomicLoad(*isRunning)) return;
 					if (regionStorage.isChunkOnDisk(chunkPos))
@@ -85,6 +86,7 @@ void storageWorkerThread(Tid mainTid, string regionDir)
 						genWorker.send(chunkPos);
 					}
 				},
+				// write
 				(ivec3 chunkPos, shared ChunkData chunkData, bool deleteData) {
 					writeChunk(chunkPos, cast(ChunkData)chunkData);