From 402b58ce4287ebc9d6f99882ef824156f0bd1555 Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Tue, 31 Dec 2019 19:38:11 -0300
Subject: [PATCH 1/3] Fix MP Special Stages crashing if a player is being
 carried when it ends

---
 src/p_user.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/p_user.c b/src/p_user.c
index ea42a2c36..292bad2af 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -347,6 +347,11 @@ void P_GiveEmerald(boolean spawnObj)
 				continue;
 			P_SetTarget(&emmo->target, players[i].mo);
 			P_SetMobjState(emmo, mobjinfo[MT_GOTEMERALD].meleestate + em);
+			
+			// Make sure we're not being carried before our tracer is changed
+			if (players[i].powers[pw_carry] != CR_NONE)
+				players[i].powers[pw_carry] = CR_NONE;
+			
 			P_SetTarget(&players[i].mo->tracer, emmo);
 
 			if (pnum == 255)

From df9809f3d71f964dd9358c67061111610886fd96 Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Tue, 31 Dec 2019 20:13:16 -0300
Subject: [PATCH 2/3] The dumbass forgot NiGHTS mode is also a carry power

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

diff --git a/src/p_user.c b/src/p_user.c
index 292bad2af..f8d1dbbc1 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -349,7 +349,7 @@ void P_GiveEmerald(boolean spawnObj)
 			P_SetMobjState(emmo, mobjinfo[MT_GOTEMERALD].meleestate + em);
 			
 			// Make sure we're not being carried before our tracer is changed
-			if (players[i].powers[pw_carry] != CR_NONE)
+			if (players[i].powers[pw_carry] == CR_PLAYER)
 				players[i].powers[pw_carry] = CR_NONE;
 			
 			P_SetTarget(&players[i].mo->tracer, emmo);

From dda18dd0803b6fa43d8797ba2337b5ba2cd0165c Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Tue, 31 Dec 2019 20:20:30 -0300
Subject: [PATCH 3/3] Or is it better like this?

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

diff --git a/src/p_user.c b/src/p_user.c
index f8d1dbbc1..586c8b022 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -349,7 +349,7 @@ void P_GiveEmerald(boolean spawnObj)
 			P_SetMobjState(emmo, mobjinfo[MT_GOTEMERALD].meleestate + em);
 			
 			// Make sure we're not being carried before our tracer is changed
-			if (players[i].powers[pw_carry] == CR_PLAYER)
+			if (players[i].powers[pw_carry] != CR_NIGHTSMODE)
 				players[i].powers[pw_carry] = CR_NONE;
 			
 			P_SetTarget(&players[i].mo->tracer, emmo);