From 414c61489319a56341ac5be808587c8c3ca84255 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 16 Oct 2011 11:52:33 +0300
Subject: Add peaceful / not peaceful distinction in mobs and the
 only_peaceful_mobs setting

---
 src/environment.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/environment.cpp')

diff --git a/src/environment.cpp b/src/environment.cpp
index a88d600bb..f6b9b0a22 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -1039,6 +1039,11 @@ void ServerEnvironment::step(float dtime)
 				i.atEnd()==false; i++)
 		{
 			ServerActiveObject* obj = i.getNode()->getValue();
+			// 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;
-- 
cgit v1.2.3