From 8b3ed78e53d8ad19d8dee3968430be258559214c Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Mon, 7 Jul 2014 01:20:25 -0400
Subject: Don't unload blocks if save failed

Improve error handling in saveBlock()
---
 src/database-dummy.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/database-dummy.cpp')

diff --git a/src/database-dummy.cpp b/src/database-dummy.cpp
index c4794d281..7f715dd19 100644
--- a/src/database-dummy.cpp
+++ b/src/database-dummy.cpp
@@ -45,7 +45,7 @@ int Database_Dummy::Initialized(void)
 void Database_Dummy::beginSave() {}
 void Database_Dummy::endSave() {}
 
-void Database_Dummy::saveBlock(MapBlock *block)
+bool Database_Dummy::saveBlock(MapBlock *block)
 {
 	DSTACK(__FUNCTION_NAME);
 	/*
@@ -53,7 +53,10 @@ void Database_Dummy::saveBlock(MapBlock *block)
 	*/
 	if(block->isDummy())
 	{
-		return;
+		v3s16 p = block->getPos();
+		infostream<<"Database_Dummy::saveBlock(): WARNING: Not writing dummy block "
+				<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;
+		return true;
 	}
 
 	// Format used for writing
@@ -76,6 +79,7 @@ void Database_Dummy::saveBlock(MapBlock *block)
 	m_database[getBlockAsInteger(p3d)] = tmp;
 	// We just wrote it to the disk so clear modified flag
 	block->resetModified();
+	return true;
 }
 
 MapBlock* Database_Dummy::loadBlock(v3s16 blockpos)
-- 
cgit v1.2.3