From 89eda2fa9bf11114630698c03028aeac64bd3523 Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Sun, 5 Jan 2020 23:18:38 -0300
Subject: [PATCH 1/4] :amybruh:

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

diff --git a/src/p_mobj.c b/src/p_mobj.c
index e8461957f..713a4d476 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7977,15 +7977,18 @@ static void P_MobjSceneryThink(mobj_t *mobj)
 		mobj->x = mobj->extravalue1 + P_ReturnThrustX(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
 		mobj->y = mobj->extravalue2 + P_ReturnThrustY(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
 		P_SetThingPosition(mobj);
-		if ((--mobj->fuse) < 6)
-		{
-			if (!mobj->fuse)
+		
+		// :amybruh:
+		if (!mobj->fuse)
 			{
-				P_RemoveMobj(mobj);
+#ifdef HAVE_BLUA
+				if (!LUAh_MobjFuse(mobj))
+#endif
+					P_RemoveMobj(mobj);
 				return;
 			}
+		if ((--mobj->fuse) < 6)
 			mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT));
-		}
 	}
 	break;
 	case MT_VWREF:

From ce45746d02e4c82b4b4605200b354e85e86a6f7d Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Sun, 5 Jan 2020 23:19:52 -0300
Subject: [PATCH 2/4] No comments

---
 src/p_mobj.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 713a4d476..05a535175 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7978,7 +7978,6 @@ static void P_MobjSceneryThink(mobj_t *mobj)
 		mobj->y = mobj->extravalue2 + P_ReturnThrustY(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
 		P_SetThingPosition(mobj);
 		
-		// :amybruh:
 		if (!mobj->fuse)
 			{
 #ifdef HAVE_BLUA

From a50549aa7cea0849fb7d7cfdce59b99b1e84afd0 Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Sun, 5 Jan 2020 23:41:22 -0300
Subject: [PATCH 3/4] Don't fuck with the fuse if it's negative

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

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 05a535175..fbfbaab00 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7986,6 +7986,8 @@ static void P_MobjSceneryThink(mobj_t *mobj)
 					P_RemoveMobj(mobj);
 				return;
 			}
+		if (mobj->fuse < 0)
+			return;
 		if ((--mobj->fuse) < 6)
 			mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT));
 	}

From 30683f5bdd5fb1ff1805a6e02c811e9a5c9098af Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Tue, 7 Jan 2020 01:24:04 -0300
Subject: [PATCH 4/4] ifdefs make indenting confusing

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

diff --git a/src/p_mobj.c b/src/p_mobj.c
index fbfbaab00..3d8d81d9b 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7979,13 +7979,13 @@ static void P_MobjSceneryThink(mobj_t *mobj)
 		P_SetThingPosition(mobj);
 		
 		if (!mobj->fuse)
-			{
+		{
 #ifdef HAVE_BLUA
-				if (!LUAh_MobjFuse(mobj))
+			if (!LUAh_MobjFuse(mobj))
 #endif
-					P_RemoveMobj(mobj);
-				return;
-			}
+				P_RemoveMobj(mobj);
+			return;
+		}
 		if (mobj->fuse < 0)
 			return;
 		if ((--mobj->fuse) < 6)