Fix SAOM (#7200)

* Bugfix

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 8f77d54c44c481286de19bc3181b0e466a56887d..3ea219846706a2b4c9dd416bb91f8ec6cfe4e9b0 100644 (file)
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -272,6 +272,8 @@ 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

diff --git a/src/server/serveractiveobjectmap.cpp b/src/server/serveractiveobjectmap.cpp
index ac89d5d18d2c21bc8b5fbb058b1f7dfbe1d84469..7c5c1c1ea212e107db9372227100b18bf9b7bc3b 100644 (file)
--- a/src/server/serveractiveobjectmap.cpp
+++ b/src/server/serveractiveobjectmap.cpp
@@ -25,15 +25,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 static constexpr float granularity = 16.0 * BS;
 
+static v3s16 getChunkPos(const v3f &pos)
+{
+       return v3s16(
+                       std::floor(pos.X / granularity),
+                       std::floor(pos.Y / granularity),
+                       std::floor(pos.Z / granularity));
+}
+
 static aabb3s16 calcBox(const aabb3f &cb)
 {
-       return aabb3s16(
-                       std::floor(cb.MinEdge.X / granularity),
-                       std::floor(cb.MinEdge.Y / granularity),
-                       std::floor(cb.MinEdge.Z / granularity),
-                       std::ceil(cb.MaxEdge.X / granularity),
-                       std::ceil(cb.MaxEdge.Y / granularity),
-                       std::ceil(cb.MaxEdge.Z / granularity));
+       return { getChunkPos(cb.MinEdge), getChunkPos(cb.MaxEdge) };
 }
 
 void ServerActiveObjectMap::addObject(ServerActiveObject *object)
@@ -46,10 +48,12 @@ void ServerActiveObjectMap::addObject(ServerActiveObject *object)
                        "object ID in use: " + std::to_string(id));
        w.object = object;
        w.has_box = w.object->getCollisionBox(&cb);
+       w.pos = getChunkPos(w.object->getBasePosition());
        if (w.has_box) {
                w.box = calcBox(cb);
                addObjectRefs(id, w.box);
        }
+       addObjectRef(id, w.pos);
        objects.emplace(id, w);
 }
 
@@ -61,6 +65,7 @@ ServerActiveObject *ServerActiveObjectMap::removeObject(u16 id)
        Wrapper w = pw->second;
        if (w.has_box)
                removeObjectRefs(id, w.box);
+       removeObjectRef(id, w.pos);
        objects.erase(pw);
        return w.object;
 }
@@ -79,19 +84,22 @@ void ServerActiveObjectMap::updateObject(u16 id)
                return;
        }
        Wrapper &w = pw->second;
+       v3s16 pos = getChunkPos(w.object->getBasePosition());
        aabb3f cb;
        aabb3s16 box;
        bool has_box = w.object->getCollisionBox(&cb);
        if (has_box)
                box = calcBox(cb);
-       if (w.has_box && has_box && w.box == box)
+       if (w.has_box && has_box && w.box == box && pos == w.pos)
                return;
        if (w.has_box)
                removeObjectRefs(id, w.box);
+       removeObjectRef(id, w.pos);
        w.box = box;
        w.has_box = has_box;
        if (w.has_box)
                addObjectRefs(id, w.box);
+       addObjectRef(id, w.pos);
 }
 
 void ServerActiveObjectMap::updateObject(ServerActiveObject *object)
@@ -151,13 +159,29 @@ std::unordered_set<u16> ServerActiveObjectMap::getObjectsNearBox(const aabb3s16
        return result;
 }
 
+void ServerActiveObjectMap::addObjectRef(u16 id, v3s16 pos)
+{
+       refmap.emplace(pos, id);
+}
+
+void ServerActiveObjectMap::removeObjectRef(u16 id, v3s16 pos)
+{
+       auto bounds = refmap.equal_range(pos);
+       for (auto iter = bounds.first; iter != bounds.second;) {
+               if (iter->second == id)
+                       iter = refmap.erase(iter);
+               else
+                       ++iter;
+       }
+}
+
 void ServerActiveObjectMap::addObjectRefs(u16 id, const aabb3s16 &box)
 {
        v3s16 p;
        for (p.Z = box.MinEdge.Z; p.Z <= box.MaxEdge.Z; p.Z++)
        for (p.Y = box.MinEdge.Y; p.Y <= box.MaxEdge.Y; p.Y++)
        for (p.X = box.MinEdge.X; p.X <= box.MaxEdge.X; p.X++)
-               refmap.emplace(p, id);
+               addObjectRef(id, p);
 }
 
 void ServerActiveObjectMap::removeObjectRefs(u16 id, const aabb3s16 &box)
@@ -165,14 +189,8 @@ void ServerActiveObjectMap::removeObjectRefs(u16 id, const aabb3s16 &box)
        v3s16 p;
        for (p.Z = box.MinEdge.Z; p.Z <= box.MaxEdge.Z; p.Z++)
        for (p.Y = box.MinEdge.Y; p.Y <= box.MaxEdge.Y; p.Y++)
-       for (p.X = box.MinEdge.X; p.X <= box.MaxEdge.X; p.X++) {
-               auto bounds = refmap.equal_range(p);
-               for (auto iter = bounds.first; iter != bounds.second;)
-                       if (iter->second == id)
-                               refmap.erase(iter++);
-                       else
-                               ++iter;
-       }
+       for (p.X = box.MinEdge.X; p.X <= box.MaxEdge.X; p.X++)
+               removeObjectRef(id, p);
 }
 
 bool ServerActiveObjectMap::isFreeId(u16 id)

diff --git a/src/server/serveractiveobjectmap.h b/src/server/serveractiveobjectmap.h
index 53ac95e278986ebac95e36b9faad71d636459771..60f6890bddc79ac65c663c07f71522d645a0cffb 100644 (file)
--- a/src/server/serveractiveobjectmap.h
+++ b/src/server/serveractiveobjectmap.h
@@ -39,6 +39,7 @@ struct ServerActiveObjectMap
        {
                ServerActiveObject *object;
                aabb3s16 box;
+               v3s16 pos;
                bool has_box;
        };
 
@@ -108,9 +109,6 @@ struct ServerActiveObjectMap
         * @note Due to inexact nature of floating-point computations, it is
         * undefined whether an object lying exactly at the boundary is included
         * in the list or not.
-        * @note Objects with base position outside of the collision box may not
-        * be returned.
-        * @note Objects without valid collision box are not returned.
         */
        std::vector<u16> getObjectsInsideRadius(v3f pos, float radius);
 
@@ -134,6 +132,8 @@ struct ServerActiveObjectMap
        const std::unordered_map<u16, Wrapper> &getObjects() const { return objects; }
 
 private:
+       void addObjectRef(u16 id, v3s16 pos);
+       void removeObjectRef(u16 id, v3s16 pos);
        void addObjectRefs(u16 id, const aabb3s16 &box);
        void removeObjectRefs(u16 id, const aabb3s16 &box);
        std::unordered_set<u16> getObjectsNearBox(const aabb3s16 &box);