Merge remote branch 'upstream/master' into sapier_experimental

Conflicts:
	src/scriptapi.cpp

1 files changed, 5 insertions, 16 deletions

diff --git a/src/map.cpp b/src/map.cpp
index 8bdc2ad4c..c245242e8 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -915,7 +915,7 @@ void Map::updateLighting(core::map<v3s16, MapBlock*> & a_blocks,
 /*
 */
 void Map::addNodeAndUpdate(v3s16 p, MapNode n,
-		core::map<v3s16, MapBlock*> &modified_blocks, std::string &player_name)
+		core::map<v3s16, MapBlock*> &modified_blocks)
 {
 	INodeDefManager *nodemgr = m_gamedef->ndef();
 
@@ -1011,7 +1011,6 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
 			errorstream<<"Failed to create node metadata \""
 					<<metadata_name<<"\""<<std::endl;
 		} else {
-			meta->setOwner(player_name);
 			setNodeMetadata(p, meta);
 		}
 	}
@@ -1291,8 +1290,7 @@ bool Map::addNodeWithEvent(v3s16 p, MapNode n)
 	bool succeeded = true;
 	try{
 		core::map<v3s16, MapBlock*> modified_blocks;
-		std::string st = std::string("");
-		addNodeAndUpdate(p, n, modified_blocks, st);
+		addNodeAndUpdate(p, n, modified_blocks);
 
 		// Copy modified_blocks to event
 		for(core::map<v3s16, MapBlock*>::Iterator
@@ -3271,10 +3269,7 @@ void ServerMap::saveBlock(MapBlock *block)
 	o.write((char*)&version, 1);
 	
 	// Write basic data
-	block->serialize(o, version);
-	
-	// Write extra data stored on disk
-	block->serializeDiskExtra(o, version);
+	block->serialize(o, version, true);
 	
 	// Write block to database
 	
@@ -3336,11 +3331,8 @@ void ServerMap::loadBlock(std::string sectordir, std::string blockfile, MapSecto
 		}
 		
 		// Read basic data
-		block->deSerialize(is, version);
+		block->deSerialize(is, version, true);
 
-		// Read extra data stored on disk
-		block->deSerializeDiskExtra(is, version);
-		
 		// If it's a new block, insert it to the map
 		if(created_new)
 			sector->insertBlock(block);
@@ -3406,10 +3398,7 @@ void ServerMap::loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool
 		}
 		
 		// Read basic data
-		block->deSerialize(is, version);
-
-		// Read extra data stored on disk
-		block->deSerializeDiskExtra(is, version);
+		block->deSerialize(is, version, true);
 		
 		// If it's a new block, insert it to the map
 		if(created_new)