diff options
| author | lhofhansl <lhofhansl@yahoo.com> | 2018-07-08 13:30:55 -0700 |
|---|---|---|
| committer | Paramat <paramat@users.noreply.github.com> | 2018-07-08 21:30:55 +0100 |
| commit | 94cd2bfeac073bf0ff0c384e4921c90f281747b0 (patch) | |
| tree | 8a07ce985e9486b2bd37c1cbb344286cea5fa446 /src/content_sao.cpp | |
| parent | 334d8c31ee96f2e6a8464c99eecf84793f598fb6 (diff) | |
| download | minetest-94cd2bfeac073bf0ff0c384e4921c90f281747b0.tar.gz minetest-94cd2bfeac073bf0ff0c384e4921c90f281747b0.tar.bz2 minetest-94cd2bfeac073bf0ff0c384e4921c90f281747b0.zip | |
Revert 6587 - Optimize entity-entity collision (#7539)
Diffstat (limited to 'src/content_sao.cpp')
| -rw-r--r-- | src/content_sao.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
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; } } |