From 5cf362dd87794e1f7e1647c641f4ab63048bd417 Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Tue, 31 Dec 2019 00:38:09 -0300
Subject: [PATCH 1/4] Disable Minecart Spawners for players already riding a
 minecart

---
 src/p_inter.c | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/p_inter.c b/src/p_inter.c
index 70fb01fd0..4804905f5 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1807,23 +1807,27 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			return;
 
 		case MT_MINECARTSPAWNER:
-			if (!player->bot && (special->fuse < TICRATE || player->powers[pw_carry] != CR_MINECART))
-			{
-				mobj_t *mcart = P_SpawnMobj(special->x, special->y, special->z, MT_MINECART);
-				P_SetTarget(&mcart->target, toucher);
-				mcart->angle = toucher->angle = player->drawangle = special->angle;
-				mcart->friction = FRACUNIT;
+			if (player->bot)
+				return;
+			if (special->fuse > TICRATE)
+				return;
+			if (player->powers[pw_carry] == CR_MINECART)
+				return;
+				
+			mobj_t *mcart = P_SpawnMobj(special->x, special->y, special->z, MT_MINECART);
+			P_SetTarget(&mcart->target, toucher);
+			mcart->angle = toucher->angle = player->drawangle = special->angle;
+			mcart->friction = FRACUNIT;
 
-				P_ResetPlayer(player);
-				player->pflags |= PF_JUMPDOWN;
-				player->powers[pw_carry] = CR_MINECART;
-				player->pflags &= ~PF_APPLYAUTOBRAKE;
-				P_SetTarget(&toucher->tracer, mcart);
-				toucher->momx = toucher->momy = toucher->momz = 0;
+			P_ResetPlayer(player);
+			player->pflags |= PF_JUMPDOWN;
+			player->powers[pw_carry] = CR_MINECART;
+			player->pflags &= ~PF_APPLYAUTOBRAKE;
+			P_SetTarget(&toucher->tracer, mcart);
+			toucher->momx = toucher->momy = toucher->momz = 0;
 
-				special->fuse = 3*TICRATE;
-				special->flags2 |= MF2_DONTDRAW;
-			}
+			special->fuse = 3*TICRATE;
+			special->flags2 |= MF2_DONTDRAW;
 			return;
 
 		case MT_MINECARTEND:

From 15d4829e19c48ed5b70af5067b91dc644bf50fb6 Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Tue, 31 Dec 2019 01:20:11 -0300
Subject: [PATCH 2/4] Appease the C90 entity

---
 src/p_inter.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/p_inter.c b/src/p_inter.c
index 4804905f5..b28b98758 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1813,21 +1813,23 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 				return;
 			if (player->powers[pw_carry] == CR_MINECART)
 				return;
-				
-			mobj_t *mcart = P_SpawnMobj(special->x, special->y, special->z, MT_MINECART);
-			P_SetTarget(&mcart->target, toucher);
-			mcart->angle = toucher->angle = player->drawangle = special->angle;
-			mcart->friction = FRACUNIT;
+			else
+			{	
+				mobj_t *mcart = P_SpawnMobj(special->x, special->y, special->z, MT_MINECART);
+				P_SetTarget(&mcart->target, toucher);
+				mcart->angle = toucher->angle = player->drawangle = special->angle;
+				mcart->friction = FRACUNIT;
 
-			P_ResetPlayer(player);
-			player->pflags |= PF_JUMPDOWN;
-			player->powers[pw_carry] = CR_MINECART;
-			player->pflags &= ~PF_APPLYAUTOBRAKE;
-			P_SetTarget(&toucher->tracer, mcart);
-			toucher->momx = toucher->momy = toucher->momz = 0;
+				P_ResetPlayer(player);
+				player->pflags |= PF_JUMPDOWN;
+				player->powers[pw_carry] = CR_MINECART;
+				player->pflags &= ~PF_APPLYAUTOBRAKE;
+				P_SetTarget(&toucher->tracer, mcart);
+				toucher->momx = toucher->momy = toucher->momz = 0;
 
-			special->fuse = 3*TICRATE;
-			special->flags2 |= MF2_DONTDRAW;
+				special->fuse = 3*TICRATE;
+				special->flags2 |= MF2_DONTDRAW;
+			}
 			return;
 
 		case MT_MINECARTEND:

From 50ffcba552abdc825c88fdeaf6cda28b64fa5817 Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Tue, 31 Dec 2019 01:48:50 -0300
Subject: [PATCH 3/4] Small

---
 src/p_inter.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/p_inter.c b/src/p_inter.c
index b28b98758..67d5a8a3f 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1807,13 +1807,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			return;
 
 		case MT_MINECARTSPAWNER:
-			if (player->bot)
-				return;
-			if (special->fuse > TICRATE)
-				return;
-			if (player->powers[pw_carry] == CR_MINECART)
-				return;
-			else
+			if (!player->bot && special->fuse <= TICRATE && player->powers[pw_carry] != CR_MINECART)
 			{	
 				mobj_t *mcart = P_SpawnMobj(special->x, special->y, special->z, MT_MINECART);
 				P_SetTarget(&mcart->target, toucher);

From 24e4552d5b0c64e3645258202902c95327a9e8ba Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Tue, 31 Dec 2019 11:19:54 -0300
Subject: [PATCH 4/4] Got rid of the uhh

---
 src/p_inter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/p_inter.c b/src/p_inter.c
index 67d5a8a3f..ff68cdf69 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1808,7 +1808,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 
 		case MT_MINECARTSPAWNER:
 			if (!player->bot && special->fuse <= TICRATE && player->powers[pw_carry] != CR_MINECART)
-			{	
+			{
 				mobj_t *mcart = P_SpawnMobj(special->x, special->y, special->z, MT_MINECART);
 				P_SetTarget(&mcart->target, toucher);
 				mcart->angle = toucher->angle = player->drawangle = special->angle;