From 7552fd94f7f73ddd351c7de9ca54ef9c93787fc8 Mon Sep 17 00:00:00 2001 From: Maikel de Vries Date: Mon, 28 Nov 2016 00:53:48 +0100 Subject: [PATCH] fix ownership changes of moving flags (#1846) --- .../Libraries.ocd/Structures.ocd/Flag.ocd/Ownable.ocd/Script.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Flag.ocd/Ownable.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Flag.ocd/Ownable.ocd/Script.c index 5a106fb5b..5372eded2 100644 --- a/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Flag.ocd/Ownable.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Flag.ocd/Ownable.ocd/Script.c @@ -63,6 +63,9 @@ protected func FxIntMovementCheckStart(object target, proplist effect, int temp) protected func FxIntMovementCheckTimer(object target, proplist effect) { + // Remove effect for structures that can't be owned. + if (!this->~CanBeOwner()) + return FX_Execute_Kill; // Check whether the structure has moved. if (GetX() != effect.x || GetY() != effect.y) {