From 414c61489319a56341ac5be808587c8c3ca84255 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 16 Oct 2011 11:52:33 +0300 Subject: Add peaceful / not peaceful distinction in mobs and the only_peaceful_mobs setting --- src/content_sao.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/content_sao.cpp') diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 8b1002c5a..e218fc765 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -1370,6 +1370,11 @@ u16 MobV2SAO::punch(const std::string &toolname, v3f dir, return 65536/100; } +bool MobV2SAO::isPeaceful() +{ + return m_properties->getBool("is_peaceful"); +} + void MobV2SAO::sendPosition() { m_last_sent_position = m_base_position; @@ -1388,6 +1393,7 @@ void MobV2SAO::sendPosition() void MobV2SAO::setPropertyDefaults() { + m_properties->setDefault("is_peaceful", "false"); m_properties->setDefault("move_type", "ground_nodes"); m_properties->setDefault("speed", "(0,0,0)"); m_properties->setDefault("age", "0"); -- cgit v1.2.3