X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcollision.cpp;h=d85a5688435a516b879c35a1b7811f7cdb2ce423;hb=32cb9d0828828da3068259c9e0a3c0f5da170439;hp=06ef820c5095b3cf8d5118ace2749c23dc34e317;hpb=6ef7ad09bbed9176d0d15f53b5cb14ef6e18a3b2;p=dragonfireclient.git

diff --git a/src/collision.cpp b/src/collision.cpp
index 06ef820c5..d85a56884 100644
--- 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;