Remove remenants of mob code

Since minetest has no mobs within the core anymore, I suppose these settings and code should go. Any mod that uses `minetest.setting_getbool` will work with no problem since the default return value is `false`.
minetest · Oct 24, 2014 · 73bf791 · 73bf791
1 parent 737cce5
commit 73bf791
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 10 deletions.
diff --git a/minetest.conf.example b/minetest.conf.example
@@ -283,8 +283,6 @@
 #creative_mode = false
 # Enable players getting damage and dying
 #enable_damage = false
-# Despawn all non-peaceful mobs
-#only_peaceful_mobs = false
 # A chosen map seed for a new map, leave empty for random
 #fixed_map_seed =
 # Gives some stuff to players at the beginning

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
@@ -197,7 +197,6 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("strict_protocol_version_checking", "false");
 	settings->setDefault("creative_mode", "false");
 	settings->setDefault("enable_damage", "true");
-	settings->setDefault("only_peaceful_mobs", "false");
 	settings->setDefault("fixed_map_seed", "");
 	settings->setDefault("give_initial_stuff", "false");
 	settings->setDefault("default_password", "");

diff --git a/src/environment.cpp b/src/environment.cpp
@@ -1225,11 +1225,6 @@ void ServerEnvironment::step(float dtime)
 				i != m_active_objects.end(); ++i)
 		{
 			ServerActiveObject* obj = i->second;
-			// Remove non-peaceful mobs on peaceful mode
-			if(g_settings->getBool("only_peaceful_mobs")){
-				if(!obj->isPeaceful())
-					obj->m_removed = true;
-			}
 			// Don't step if is to be removed or stored statically
 			if(obj->m_removed || obj->m_pending_deactivation)
 				continue;

diff --git a/src/serverobject.h b/src/serverobject.h
@@ -97,8 +97,6 @@ class ServerActiveObject : public ActiveObject
 	// If object has moved less than this and data has not changed,
 	// saving to disk may be omitted
 	virtual float getMinimumSavedMovement();
-
-	virtual bool isPeaceful(){return true;}
 
 	virtual std::string getDescription(){return "SAO";}