Mods: Combine mod loading checks and deprection logging (#11503)

[dragonfireclient.git] / src / collision.cpp

diff --git a/src/collision.cpp b/src/collision.cpp
index 06ef820c5095b3cf8d5118ace2749c23dc34e317..d85a5688435a516b879c35a1b7811f7cdb2ce423 100644 (file)
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -397,7 +397,8 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
                                // we directly use the callback to populate the result to prevent
                                // a useless result loop here
                                auto include_obj_cb = [self, &objects] (ServerActiveObject *obj) {
-                                       if (!self || (self != obj && self != obj->getParent())) {
+                                       if (!obj->isGone() &&
+                                               (!self || (self != obj && self != obj->getParent()))) {
                                                objects.push_back((ActiveObject *)obj);
                                        }
                                        return false;