From 2b3922a8f3a4aefb316b508cfdaaa42eac57d269 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Mon, 23 Dec 2019 20:12:45 +0100
Subject: [PATCH] Set mthing->mobj before the flags handling code, since at
 this point the setup can't fail anymore

---
 src/p_mobj.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 04411f585..1acecbb76 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -13033,12 +13033,11 @@ void P_SpawnMapThing(mapthing_t *mthing)
 	if (doangle)
 		mobj->angle = FixedAngle(mthing->angle<<FRACBITS);
 
+	mthing->mobj = mobj;
+
 	// ignore MTF_ flags and return early
 	if (i == MT_NIGHTSBUMPER)
-	{
-		mthing->mobj = mobj;
 		return;
-	}
 
 	if ((mthing->options & MTF_AMBUSH)
 	&& (mthing->options & MTF_OBJECTSPECIAL)
@@ -13073,8 +13072,6 @@ void P_SpawnMapThing(mapthing_t *mthing)
 	// Final set of not being able to draw nightsitems.
 	if (mobj->flags & MF_NIGHTSITEM)
 		mobj->flags2 |= MF2_DONTDRAW;
-
-	mthing->mobj = mobj;
 }
 
 static void P_SpawnHoop(mapthing_t* mthing, fixed_t x, fixed_t y, fixed_t z, sector_t* sec, INT32 hoopsize, fixed_t sizefactor)