X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmap.cpp;h=8bdc2ad4c97f341e8bffd3faa737cfccdcad97de;hb=cd563473fa298db3b910009f26ba263bacd84be9;hp=822b3f659bf06aa6a10e7afdc3d34a096ec2cf2a;hpb=e5650bb54917ead2dccac9b46dfa1a00cd737694;p=oweals%2Fminetest.git

diff --git a/src/map.cpp b/src/map.cpp
index 822b3f659..8bdc2ad4c 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -208,6 +208,15 @@ void Map::setNode(v3s16 p, MapNode & n)
 	v3s16 blockpos = getNodeBlockPos(p);
 	MapBlock *block = getBlockNoCreate(blockpos);
 	v3s16 relpos = p - blockpos*MAP_BLOCKSIZE;
+	// Never allow placing CONTENT_IGNORE, it fucks up stuff
+	if(n.getContent() == CONTENT_IGNORE){
+		errorstream<<"Map::setNode(): Not allowing to place CONTENT_IGNORE"
+				<<" while trying to replace \""
+				<<m_gamedef->ndef()->get(block->getNodeNoCheck(relpos)).name
+				<<"\" at "<<PP(p)<<" (block "<<PP(blockpos)<<")"<<std::endl;
+		debug_stacks_print_to(infostream);
+		return;
+	}
 	block->setNodeNoCheck(relpos, n);
 }
 
@@ -851,15 +860,15 @@ void Map::updateLighting(enum LightBank bank,
 			for(s16 y=-1; y<=1; y++)
 			for(s16 x=-1; x<=1; x++)
 			{
-				v3s16 p(x,y,z);
-				MapBlock *block = getBlockNoCreateNoEx(p);
+				v3s16 p2 = p + v3s16(x,y,z);
+				MapBlock *block = getBlockNoCreateNoEx(p2);
 				if(block == NULL)
 					continue;
 				if(block->isDummy())
 					continue;
 				if(block->getLightingExpired())
 					continue;
-				vmanip.initialEmerge(p, p);
+				vmanip.initialEmerge(p2, p2);
 			}*/
 
 			// Lighting of block will be updated completely
@@ -998,8 +1007,13 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
 	std::string metadata_name = nodemgr->get(n).metadata_name;
 	if(metadata_name != ""){
 		NodeMetadata *meta = NodeMetadata::create(metadata_name, m_gamedef);
-		meta->setOwner(player_name);
-		setNodeMetadata(p, meta);
+		if(!meta){
+			errorstream<<"Failed to create node metadata \""
+					<<metadata_name<<"\""<<std::endl;
+		} else {
+			meta->setOwner(player_name);
+			setNodeMetadata(p, meta);
+		}
 	}
 
 	/*
@@ -1396,6 +1410,7 @@ void Map::timerUpdate(float dtime, float unload_timeout,
 	core::list<v2s16> sector_deletion_queue;
 	u32 deleted_blocks_count = 0;
 	u32 saved_blocks_count = 0;
+	u32 block_count_all = 0;
 
 	core::map<v2s16, MapSector*>::Iterator si;
 
@@ -1441,6 +1456,7 @@ void Map::timerUpdate(float dtime, float unload_timeout,
 			else
 			{
 				all_blocks_deleted = false;
+				block_count_all++;
 			}
 		}
 
@@ -1461,6 +1477,7 @@ void Map::timerUpdate(float dtime, float unload_timeout,
 				<<" blocks from memory";
 		if(save_before_unloading)
 			infostream<<", of which "<<saved_blocks_count<<" were written";
+		infostream<<", "<<block_count_all<<" blocks in memory";
 		infostream<<"."<<std::endl;
 		if(saved_blocks_count != 0){
 			PrintInfo(infostream); // ServerMap/ClientMap:
@@ -1666,7 +1683,9 @@ void Map::transformLiquids(core::map<v3s16, MapBlock*> & modified_blocks)
 					if (nodemgr->getId(nodemgr->get(nb.n).liquid_alternative_flowing) != liquid_kind) {
 						neutrals[num_neutrals++] = nb;
 					} else {
-						sources[num_sources++] = nb;
+						// Do not count bottom source, it will screw things up
+						if(dirs[i].Y != -1)
+							sources[num_sources++] = nb;
 					}
 					break;
 				case LIQUID_FLOWING:
@@ -1999,7 +2018,7 @@ ServerMap::ServerMap(std::string savedir, IGameDef *gamedef):
 	emergeSector(v2s16(0,0));
 
 	// Initially write whole map
-	save(false);
+	save(MOD_STATE_CLEAN);
 }
 
 ServerMap::~ServerMap()
@@ -2011,7 +2030,7 @@ ServerMap::~ServerMap()
 		if(m_map_saving_enabled)
 		{
 			// Save only changed parts
-			save(true);
+			save(MOD_STATE_WRITE_AT_UNLOAD);
 			infostream<<"Server: saved map to "<<m_savedir<<std::endl;
 		}
 		else
@@ -2150,7 +2169,17 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
 
 	/*infostream<<"Resulting vmanip:"<<std::endl;
 	data->vmanip.print(infostream);*/
-	
+
+	// Make sure affected blocks are loaded
+	for(s16 x=-1; x<=1; x++)
+	for(s16 z=-1; z<=1; z++)
+	for(s16 y=-1; y<=1; y++)
+	{
+		v3s16 p(blockpos.X+x, blockpos.Y+y, blockpos.Z+z);
+		// Load from disk if not already in memory
+		emergeBlock(p, false);
+	}
+
 	/*
 		Blit generated stuff to map
 		NOTE: blitBackAll adds nearly everything to changed_blocks
@@ -2302,7 +2331,7 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
 		Save changed parts of map
 		NOTE: Will be saved later.
 	*/
-	//save(true);
+	//save(MOD_STATE_WRITE_AT_UNLOAD);
 
 	/*infostream<<"finishBlockMake() done for ("<<blockpos.X<<","<<blockpos.Y<<","
 			<<blockpos.Z<<")"<<std::endl;*/
@@ -2810,7 +2839,7 @@ std::string ServerMap::getBlockFilename(v3s16 p)
 	return cc;
 }
 
-void ServerMap::save(bool only_changed)
+void ServerMap::save(ModifiedState save_level)
 {
 	DSTACK(__FUNCTION_NAME);
 	if(m_map_saving_enabled == false)
@@ -2819,11 +2848,11 @@ void ServerMap::save(bool only_changed)
 		return;
 	}
 	
-	if(only_changed == false)
+	if(save_level == MOD_STATE_CLEAN)
 		infostream<<"ServerMap: Saving whole map, this can take time."
 				<<std::endl;
 	
-	if(only_changed == false || m_map_metadata_changed)
+	if(m_map_metadata_changed || save_level == MOD_STATE_CLEAN)
 	{
 		saveMapMeta();
 	}
@@ -2844,7 +2873,7 @@ void ServerMap::save(bool only_changed)
 		ServerMapSector *sector = (ServerMapSector*)i.getNode()->getValue();
 		assert(sector->getId() == MAPSECTOR_SERVER);
 	
-		if(sector->differs_from_disk || only_changed == false)
+		if(sector->differs_from_disk || save_level == MOD_STATE_CLEAN)
 		{
 			saveSectorMeta(sector);
 			sector_meta_count++;
@@ -2859,8 +2888,7 @@ void ServerMap::save(bool only_changed)
 			
 			block_count_all++;
 
-			if(block->getModified() >= MOD_STATE_WRITE_NEEDED 
-					|| only_changed == false)
+			if(block->getModified() >= save_level)
 			{
 				// Lazy beginSave()
 				if(!save_started){
@@ -2887,7 +2915,7 @@ void ServerMap::save(bool only_changed)
 	/*
 		Only print if something happened or saved whole map
 	*/
-	if(only_changed == false || sector_meta_count != 0
+	if(save_level == MOD_STATE_CLEAN || sector_meta_count != 0
 			|| block_count != 0)
 	{
 		infostream<<"ServerMap: Written: "