X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fenvironment.cpp;h=d9f24ede90aad05e7e5683fb09a4a30cffe41a82;hb=f97d4355beb79370d3bc69ea6baabb33ed90a8cd;hp=16bdcf9791e42c3cddc831e70076392a1b315196;hpb=9a62a909bc9dd3ed7513b07d3d451769757b69f0;p=dragonfireclient.git

diff --git a/src/environment.cpp b/src/environment.cpp
index 16bdcf979..d9f24ede9 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -29,6 +29,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "log.h"
 #include "profiler.h"
+#include "scriptapi.h"
+#include "mapnode_contentfeatures.h"
+#include "nodemetadata.h"
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 
@@ -267,9 +270,9 @@ void ActiveBlockList::update(core::list<v3s16> &active_positions,
 	ServerEnvironment
 */
 
-ServerEnvironment::ServerEnvironment(ServerMap *map, Server *server):
+ServerEnvironment::ServerEnvironment(ServerMap *map, lua_State *L):
 	m_map(map),
-	m_server(server),
+	m_lua(L),
 	m_random_spawn_timer(3),
 	m_send_recommended_timer(0),
 	m_game_time(0),
@@ -605,7 +608,7 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)
 	activateObjects(block);
 
 	// Run node metadata
-	bool changed = block->m_node_metadata.step((float)dtime_s);
+	bool changed = block->m_node_metadata->step((float)dtime_s);
 	if(changed)
 	{
 		MapEditEvent event;
@@ -647,6 +650,94 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)
 	}
 }
 
+void ServerEnvironment::clearAllObjects()
+{
+	infostream<<"ServerEnvironment::clearAllObjects(): "
+			<<"Removing all active objects"<<std::endl;
+	core::list<u16> objects_to_remove;
+	for(core::map<u16, ServerActiveObject*>::Iterator
+			i = m_active_objects.getIterator();
+			i.atEnd()==false; i++)
+	{
+		ServerActiveObject* obj = i.getNode()->getValue();
+		u16 id = i.getNode()->getKey();		
+		v3f objectpos = obj->getBasePosition();	
+		// Delete static object if block is loaded
+		if(obj->m_static_exists){
+			MapBlock *block = m_map->getBlockNoCreateNoEx(obj->m_static_block);
+			if(block){
+				block->m_static_objects.remove(id);
+				block->raiseModified(MOD_STATE_WRITE_NEEDED);
+				obj->m_static_exists = false;
+			}
+		}
+		// If known by some client, don't delete immediately
+		if(obj->m_known_by_count > 0){
+			obj->m_pending_deactivation = true;
+			obj->m_removed = true;
+			continue;
+		}
+		// Deregister in scripting api
+		scriptapi_rm_object_reference(m_lua, obj);
+		// Delete active object
+		delete obj;
+		// Id to be removed from m_active_objects
+		objects_to_remove.push_back(id);
+	}
+	// Remove references from m_active_objects
+	for(core::list<u16>::Iterator i = objects_to_remove.begin();
+			i != objects_to_remove.end(); i++)
+	{
+		m_active_objects.remove(*i);
+	}
+
+	core::list<v3s16> loadable_blocks;
+	infostream<<"ServerEnvironment::clearAllObjects(): "
+			<<"Listing all loadable blocks"<<std::endl;
+	m_map->listAllLoadableBlocks(loadable_blocks);
+	infostream<<"ServerEnvironment::clearAllObjects(): "
+			<<"Done listing all loadable blocks: "
+			<<loadable_blocks.size()
+			<<", now clearing"<<std::endl;
+	u32 report_interval = loadable_blocks.size() / 10;
+	u32 num_blocks_checked = 0;
+	u32 num_blocks_cleared = 0;
+	u32 num_objs_cleared = 0;
+	for(core::list<v3s16>::Iterator i = loadable_blocks.begin();
+			i != loadable_blocks.end(); i++)
+	{
+		v3s16 p = *i;
+		MapBlock *block = m_map->emergeBlock(p, false);
+		if(!block){
+			errorstream<<"ServerEnvironment::clearAllObjects(): "
+					<<"Failed to emerge block "<<PP(p)<<std::endl;
+			continue;
+		}
+		u32 num_stored = block->m_static_objects.m_stored.size();
+		u32 num_active = block->m_static_objects.m_active.size();
+		if(num_stored != 0 || num_active != 0){
+			block->m_static_objects.m_stored.clear();
+			block->m_static_objects.m_active.clear();
+			block->raiseModified(MOD_STATE_WRITE_NEEDED);
+			num_objs_cleared += num_stored + num_active;
+			num_blocks_cleared++;
+		}
+		num_blocks_checked++;
+
+		if(num_blocks_checked % report_interval == 0){
+			float percent = 100.0 * (float)num_blocks_checked /
+					loadable_blocks.size();
+			infostream<<"ServerEnvironment::clearAllObjects(): "
+					<<"Cleared "<<num_objs_cleared<<" objects"
+					<<" in "<<num_blocks_cleared<<" blocks ("
+					<<percent<<"%)"<<std::endl;
+		}
+	}
+	infostream<<"ServerEnvironment::clearAllObjects(): "
+			<<"Finished: Cleared "<<num_objs_cleared<<" objects"
+			<<" in "<<num_blocks_cleared<<" blocks"<<std::endl;
+}
+
 static void getMob_dungeon_master(Settings &properties)
 {
 	properties.set("looks", "dungeon_master");
@@ -827,7 +918,7 @@ void ServerEnvironment::step(float dtime)
 			block->setTimestampNoChangedFlag(m_game_time);
 
 			// Run node metadata
-			bool changed = block->m_node_metadata.step(dtime);
+			bool changed = block->m_node_metadata->step(dtime);
 			if(changed)
 			{
 				MapEditEvent event;
@@ -887,9 +978,10 @@ void ServerEnvironment::step(float dtime)
 				if(block==NULL)
 					continue;
 				active_object_count_wider +=
-						block->m_static_objects.m_active.size();
+						block->m_static_objects.m_active.size()
+						+ block->m_static_objects.m_stored.size();
 				
-				if(block->m_static_objects.m_stored.size() != 0){
+				/*if(block->m_static_objects.m_stored.size() != 0){
 					errorstream<<"ServerEnvironment::step(): "
 							<<PP(block->getPos())<<" contains "
 							<<block->m_static_objects.m_stored.size()
@@ -897,7 +989,7 @@ void ServerEnvironment::step(float dtime)
 							<<"when spawning objects, when counting active "
 							<<"objects in wide area. relative position: "
 							<<"("<<x<<","<<y<<","<<z<<")"<<std::endl;
-				}
+				}*/
 			}
 
 			v3s16 p0;
@@ -956,7 +1048,7 @@ void ServerEnvironment::step(float dtime)
 								n1.getContent() == CONTENT_AIR)
 						{
 							v3f pos = intToFloat(p1, BS);
-							ServerActiveObject *obj = new RatSAO(this, 0, pos);
+							ServerActiveObject *obj = new RatSAO(this, pos);
 							addActiveObject(obj);
 						}
 					}
@@ -984,21 +1076,21 @@ void ServerEnvironment::step(float dtime)
 									Settings properties;
 									getMob_dungeon_master(properties);
 									ServerActiveObject *obj = new MobV2SAO(
-											this, 0, pos, &properties);
+											this, pos, &properties);
 									addActiveObject(obj);
 								} else if(i == 2 || i == 3){
 									actionstream<<"Rats spawn at "
 											<<PP(p1)<<std::endl;
 									for(int j=0; j<3; j++){
 										ServerActiveObject *obj = new RatSAO(
-												this, 0, pos);
+												this, pos);
 										addActiveObject(obj);
 									}
 								} else {
 									actionstream<<"An oerkki spawns at "
 											<<PP(p1)<<std::endl;
 									ServerActiveObject *obj = new Oerkki1SAO(
-											this, 0, pos);
+											this, pos);
 									addActiveObject(obj);
 								}
 							}
@@ -1051,6 +1143,11 @@ void ServerEnvironment::step(float dtime)
 		}
 	}
 	
+	/*
+		Step script environment (run global on_step())
+	*/
+	scriptapi_environment_step(m_lua, dtime);
+
 	/*
 		Step active objects
 	*/
@@ -1063,9 +1160,9 @@ void ServerEnvironment::step(float dtime)
 		// This helps the objects to send data at the same time
 		bool send_recommended = false;
 		m_send_recommended_timer += dtime;
-		if(m_send_recommended_timer > 0.10)
+		if(m_send_recommended_timer > getSendRecommendedInterval())
 		{
-			m_send_recommended_timer = 0;
+			m_send_recommended_timer -= getSendRecommendedInterval();
 			send_recommended = true;
 		}
 
@@ -1141,18 +1238,18 @@ void ServerEnvironment::step(float dtime)
 			Create a ServerActiveObject
 		*/
 
-		//TestSAO *obj = new TestSAO(this, 0, pos);
-		//ServerActiveObject *obj = new ItemSAO(this, 0, pos, "CraftItem Stick 1");
-		//ServerActiveObject *obj = new RatSAO(this, 0, pos);
-		//ServerActiveObject *obj = new Oerkki1SAO(this, 0, pos);
-		//ServerActiveObject *obj = new FireflySAO(this, 0, pos);
+		//TestSAO *obj = new TestSAO(this, pos);
+		//ServerActiveObject *obj = new ItemSAO(this, pos, "CraftItem Stick 1");
+		//ServerActiveObject *obj = new RatSAO(this, pos);
+		//ServerActiveObject *obj = new Oerkki1SAO(this, pos);
+		//ServerActiveObject *obj = new FireflySAO(this, pos);
 
 		infostream<<"Server: Spawning MobV2SAO at "
 				<<"("<<pos.X<<","<<pos.Y<<","<<pos.Z<<")"<<std::endl;
 		
 		Settings properties;
 		getMob_dungeon_master(properties);
-		ServerActiveObject *obj = new MobV2SAO(this, 0, pos, &properties);
+		ServerActiveObject *obj = new MobV2SAO(this, pos, &properties);
 		addActiveObject(obj);
 	}
 #endif
@@ -1399,13 +1496,18 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
 		object->m_static_block = blockpos;
 
 		if(set_changed)
-			block->setChangedFlag();
+			block->raiseModified(MOD_STATE_WRITE_NEEDED);
 	}
 	else{
 		errorstream<<"ServerEnvironment::addActiveObjectRaw(): "
 				<<"could not find block for storing id="<<object->getId()
 				<<" statically"<<std::endl;
 	}
+	
+	// Register reference in scripting api (must be done before post-init)
+	scriptapi_add_object_reference(m_lua, object);
+	// Post-initialize object
+	object->addedToEnvironment(object->getId());
 
 	return object->getId();
 }
@@ -1444,11 +1546,12 @@ void ServerEnvironment::removeRemovedObjects()
 		*/
 		if(obj->m_static_exists && obj->m_removed)
 		{
-			MapBlock *block = m_map->getBlockNoCreateNoEx(obj->m_static_block);
+			MapBlock *block = m_map->emergeBlock(obj->m_static_block);
 			if(block)
 			{
 				block->m_static_objects.remove(id);
-				block->setChangedFlag();
+				block->raiseModified(MOD_STATE_WRITE_NEEDED);
+				obj->m_static_exists = false;
 			}
 		}
 
@@ -1456,6 +1559,9 @@ void ServerEnvironment::removeRemovedObjects()
 		if(obj->m_known_by_count > 0)
 			continue;
 		
+		// Deregister in scripting api
+		scriptapi_rm_object_reference(m_lua, obj);
+
 		// Delete
 		delete obj;
 		// Id to be removed from m_active_objects
@@ -1517,12 +1623,15 @@ void ServerEnvironment::activateObjects(MapBlock *block)
 			<<"activating objects of block "<<PP(block->getPos())
 			<<" ("<<block->m_static_objects.m_stored.size()
 			<<" objects)"<<std::endl;
-	bool large_amount = (block->m_static_objects.m_stored.size() >= 51);
+	bool large_amount = (block->m_static_objects.m_stored.size() > 49);
 	if(large_amount){
 		errorstream<<"suspiciously large amount of objects detected: "
 				<<block->m_static_objects.m_stored.size()<<" in "
 				<<PP(block->getPos())
-				<<"; not activating."<<std::endl;
+				<<"; removing all of them."<<std::endl;
+		// Clear stored list
+		block->m_static_objects.m_stored.clear();
+		block->raiseModified(MOD_STATE_WRITE_NEEDED);
 		return;
 	}
 	// A list for objects that couldn't be converted to static for some
@@ -1556,7 +1665,6 @@ void ServerEnvironment::activateObjects(MapBlock *block)
 				<<" type="<<(int)s_obj.type<<std::endl;
 		// This will also add the object to the active static list
 		addActiveObjectRaw(obj, false);
-		//u16 id = addActiveObjectRaw(obj, false);
 	}
 	// Clear stored list
 	block->m_static_objects.m_stored.clear();
@@ -1568,13 +1676,18 @@ void ServerEnvironment::activateObjects(MapBlock *block)
 		StaticObject &s_obj = *i;
 		block->m_static_objects.m_stored.push_back(s_obj);
 	}
-	// Block has been modified
-	// NOTE: No it has not really. Save I/O here.
-	//block->setChangedFlag();
+	/*
+		Note: Block hasn't really been modified here.
+		The objects have just been activated and moved from the stored
+		static list to the active static list.
+		As such, the block is essentially the same.
+		Thus, do not call block->setChangedFlag().
+		Otherwise there would be a huge amount of unnecessary I/O.
+	*/
 }
 
 /*
-	Convert objects that are not in active blocks to static.
+	Convert objects that are not standing inside active blocks to static.
 
 	If m_known_by_count != 0, active object is not deleted, but static
 	data is still updated.
@@ -1594,12 +1707,16 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
 		// This shouldn't happen but check it
 		if(obj == NULL)
 		{
-			infostream<<"NULL object found in ServerEnvironment"
+			errorstream<<"NULL object found in ServerEnvironment"
 					<<std::endl;
 			assert(0);
 			continue;
 		}
 
+		// If pending deactivation, let removeRemovedObjects() do it
+		if(obj->m_pending_deactivation)
+			continue;
+
 		u16 id = i.getNode()->getKey();		
 		v3f objectpos = obj->getBasePosition();	
 
@@ -1614,54 +1731,83 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
 				<<"deactivating object id="<<id<<" on inactive block "
 				<<PP(blockpos_o)<<std::endl;
 
+		// If known by some client, don't immediately delete.
+		bool pending_delete = (obj->m_known_by_count > 0 && !force_delete);
+
 		/*
 			Update the static data
 		*/
 
+		// Create new static object
+		std::string staticdata_new = obj->getStaticData();
+		StaticObject s_obj(obj->getType(), objectpos, staticdata_new);
+		
+		bool stays_in_same_block = false;
+		bool data_changed = true;
+
+		if(obj->m_static_exists){
+			if(obj->m_static_block == blockpos_o)
+				stays_in_same_block = true;
+
+			MapBlock *block = m_map->emergeBlock(obj->m_static_block, false);
+			
+			core::map<u16, StaticObject>::Node *n =
+					block->m_static_objects.m_active.find(id);
+			if(n){
+				StaticObject static_old = n->getValue();
+
+				float save_movem = obj->getMinimumSavedMovement();
+
+				if(static_old.data == staticdata_new &&
+						(static_old.pos - objectpos).getLength() < save_movem)
+					data_changed = false;
+			} else {
+				errorstream<<"ServerEnvironment::deactivateFarObjects(): "
+						<<"id="<<id<<" m_static_exists=true but "
+						<<"static data doesn't actually exist in "
+						<<PP(obj->m_static_block)<<std::endl;
+			}
+		}
+
+		bool shall_be_written = (!stays_in_same_block || data_changed);
+		
 		// Delete old static object
-		MapBlock *oldblock = NULL;
 		if(obj->m_static_exists)
 		{
-			MapBlock *block = m_map->getBlockNoCreateNoEx
-					(obj->m_static_block);
+			MapBlock *block = m_map->emergeBlock(obj->m_static_block, false);
 			if(block)
 			{
 				block->m_static_objects.remove(id);
-				oldblock = block;
+				obj->m_static_exists = false;
+				// Only mark block as modified if data changed considerably
+				if(shall_be_written)
+					block->raiseModified(MOD_STATE_WRITE_NEEDED);
 			}
-			obj->m_static_exists = false;
 		}
 
-		// Create new static object
-		std::string staticdata = obj->getStaticData();
-		StaticObject s_obj(obj->getType(), objectpos, staticdata);
 		// Add to the block where the object is located in
 		v3s16 blockpos = getNodeBlockPos(floatToInt(objectpos, BS));
 		// Get or generate the block
 		MapBlock *block = m_map->emergeBlock(blockpos);
 
-		/*MapBlock *block = m_map->getBlockNoCreateNoEx(blockpos);
-		if(block == NULL)
-		{
-			// Block not found. Is the old block still ok?
-			if(oldblock)
-				block = oldblock;
-			// Load from disk or generate
-			else
-				block = m_map->emergeBlock(blockpos);
-		}*/
-
 		if(block)
 		{
-			if(block->m_static_objects.m_stored.size() >= 50){
+			if(block->m_static_objects.m_stored.size() >= 49){
 				errorstream<<"ServerEnv: Trying to store id="<<obj->getId()
 						<<" statically but block "<<PP(blockpos)
-						<<" already contains over 50 objects."
+						<<" already contains "
+						<<block->m_static_objects.m_stored.size()
+						<<" (over 49) objects."
 						<<" Forcing delete."<<std::endl;
 				force_delete = true;
 			} else {
-				block->m_static_objects.insert(0, s_obj);
-				block->setChangedFlag();
+				u16 new_id = pending_delete ? id : 0;
+				block->m_static_objects.insert(new_id, s_obj);
+				
+				// Only mark block as modified if data changed considerably
+				if(shall_be_written)
+					block->raiseModified(MOD_STATE_WRITE_NEEDED);
+				
 				obj->m_static_exists = true;
 				obj->m_static_block = block->getPos();
 			}
@@ -1674,12 +1820,11 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
 		}
 
 		/*
-			Delete active object if not known by some client,
-			else set pending deactivation
+			If known by some client, set pending deactivation.
+			Otherwise delete it immediately.
 		*/
 
-		// If known by some client, don't delete.
-		if(obj->m_known_by_count > 0 && force_delete == false)
+		if(pending_delete)
 		{
 			verbosestream<<"ServerEnvironment::deactivateFarObjects(): "
 					<<"object id="<<id<<" is known by clients"
@@ -1692,6 +1837,10 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
 		verbosestream<<"ServerEnvironment::deactivateFarObjects(): "
 				<<"object id="<<id<<" is not known by clients"
 				<<"; deleting"<<std::endl;
+
+		// Deregister in scripting api
+		scriptapi_rm_object_reference(m_lua, obj);
+
 		// Delete active object
 		delete obj;
 		// Id to be removed from m_active_objects