From 842eb5da280b09e046531dd03fe9b9b20752ad12 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 28 Nov 2011 00:45:34 +0200
Subject: Replace old active block random node modifying things with actual
 ActiveBlockModifiers

---
 src/mapblock.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/mapblock.cpp')

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index bc678db15..016cb222e 100644
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -48,6 +48,7 @@ MapBlock::MapBlock(Map *parent, v3s16 pos, IGameDef *gamedef, bool dummy):
 		m_day_night_differs(false),
 		m_generated(false),
 		m_timestamp(BLOCK_TIMESTAMP_UNDEFINED),
+		m_disk_timestamp(BLOCK_TIMESTAMP_UNDEFINED),
 		m_usage_timer(0)
 {
 	data = NULL;
@@ -928,10 +929,12 @@ void MapBlock::deSerializeDiskExtra(std::istream &is, u8 version)
 		m_static_objects.deSerialize(is);
 		
 	// Timestamp
-	if(version >= 17)
+	if(version >= 17){
 		setTimestamp(readU32(is));
-	else
+		m_disk_timestamp = m_timestamp;
+	} else {
 		setTimestamp(BLOCK_TIMESTAMP_UNDEFINED);
+	}
 	
 	// Dynamically re-set ids based on node names
 	NameIdMapping nimap;
-- 
cgit v1.2.3