aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/defaultsettings.cpp1
-rw-r--r--src/environment.cpp5
-rw-r--r--src/serverobject.h2
3 files changed, 0 insertions, 8 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index dc4a59be3..2d6851c2c 100644
--- 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
index 8977ee673..64c998671 100644
--- 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
index 13a075a25..b57d3a2ba 100644
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -97,8 +97,6 @@ public:
// 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";}