Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / serverenvironment.cpp

diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index 630c111c5a36c5252182db68b427645f82faf9a3..6a9001052e2008c3817b324f1b7d93c20cd2e67e 100644 (file)
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -1185,7 +1185,7 @@ void ServerEnvironment::clearObjects(ClearObjectsMode mode)
                // Tell the object about removal
                obj->removingFromEnvironment();
                // Deregister in scripting api
-               m_script->removeObjectReference(obj);
+               m_script->removeObjectReference(dynamic_cast<ActiveObject *>(obj));
 
                // Delete active object
                if (obj->environmentDeletes())
@@ -1780,7 +1780,7 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
        }
 
        // Register reference in scripting api (must be done before post-init)
-       m_script->addObjectReference(object);
+       m_script->addObjectReference(dynamic_cast<ActiveObject *>(object));
        // Post-initialize object
        object->addedToEnvironment(dtime_s);
 
@@ -1870,7 +1870,7 @@ void ServerEnvironment::removeRemovedObjects()
                // Tell the object about removal
                obj->removingFromEnvironment();
                // Deregister in scripting api
-               m_script->removeObjectReference(obj);
+               m_script->removeObjectReference(dynamic_cast<ActiveObject *>(obj));
 
                // Delete
                if (obj->environmentDeletes())
@@ -2135,7 +2135,7 @@ void ServerEnvironment::deactivateFarObjects(bool _force_delete)
                // Tell the object about removal
                obj->removingFromEnvironment();
                // Deregister in scripting api
-               m_script->removeObjectReference(obj);
+               m_script->removeObjectReference(dynamic_cast<ActiveObject *>(obj));
 
                // Delete active object
                if (obj->environmentDeletes())