From 122104815a33f20c7dbad8298e629d5fb647aff9 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Sat, 2 May 2020 15:33:15 +0200
Subject: [PATCH] Revert some very incorrect refactoring

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

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 1d3fe8b46a..301f3a8d6a 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1741,13 +1741,14 @@ static void P_PushableCheckBustables(mobj_t *mo)
 			if (rover->master->flags & ML_EFFECT5)
 				P_LinedefExecute((INT16)(P_AproxDistance(rover->master->dx, rover->master->dy)>>FRACBITS), mo, node->m_sector);
 
-			P_UnsetThingPosition(mo);
-			mo->x = oldx;
-			mo->y = oldy;
-			P_SetThingPosition(mo);
-			return;
+			goto bustupdone;
 		}
 	}
+bustupdone:
+	P_UnsetThingPosition(mo);
+	mo->x = oldx;
+	mo->y = oldy;
+	P_SetThingPosition(mo);
 }
 
 //
-- 
GitLab