From 2df2946016b52562187bb03ffd05ea34dc527dec Mon Sep 17 00:00:00 2001 From: David Dormagen Date: Fri, 27 May 2016 22:19:41 +0200 Subject: [PATCH] OnInIncendiaryMaterial: check for object removal after energy loss --- planet/System.ocg/Fire.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/planet/System.ocg/Fire.c b/planet/System.ocg/Fire.c index b8c00831d..748ea6b6c 100644 --- a/planet/System.ocg/Fire.c +++ b/planet/System.ocg/Fire.c @@ -78,6 +78,8 @@ global func Incinerate( global func OnInIncendiaryMaterial() { this->DoEnergy(-7, false, FX_Call_EngFire, NO_OWNER); + // The object might have removed itself. + if (!this) return true; return this->Incinerate(15, NO_OWNER); }