From 94cd2bfeac073bf0ff0c384e4921c90f281747b0 Mon Sep 17 00:00:00 2001 From: lhofhansl Date: Sun, 8 Jul 2018 13:30:55 -0700 Subject: Revert 6587 - Optimize entity-entity collision (#7539) --- src/content_sao.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/content_sao.cpp') diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 6ed78beb0..b67a63e3b 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -287,7 +287,6 @@ ObjectProperties* UnitSAO::accessObjectProperties() void UnitSAO::notifyObjectPropertiesModified() { - m_env->updateActiveObject(this); m_properties_sent = false; } @@ -334,8 +333,6 @@ void LuaEntitySAO::addedToEnvironment(u32 dtime_s) // Get properties m_env->getScriptIface()-> luaentity_GetProperties(m_id, &m_prop); - // Notify the environment of the new properties - m_env->updateActiveObject(this); // Initialize HP from properties m_hp = m_prop.hp_max; // Activate entity, supplying serialized state @@ -669,7 +666,6 @@ void LuaEntitySAO::setPos(const v3f &pos) if(isAttached()) return; m_base_position = pos; - m_env->updateActiveObject(this); sendPosition(false, true); } @@ -678,7 +674,6 @@ void LuaEntitySAO::moveTo(v3f pos, bool continuous) if(isAttached()) return; m_base_position = pos; - m_env->updateActiveObject(this); if(!continuous) sendPosition(true, true); } @@ -1169,7 +1164,6 @@ void PlayerSAO::setBasePosition(const v3f &position) // Updating is not wanted/required for player migration if (m_env) { - m_env->updateActiveObject(this); m_position_not_sent = true; } } -- cgit v1.2.3