From ad23726cb64ee8810486cbb76daf6f8e0e8837f4 Mon Sep 17 00:00:00 2001
From: Player701 <player701@player701.ru>
Date: Sun, 14 Apr 2019 11:41:36 +0300
Subject: [PATCH] - Fixed conditions tested for when checking whether "Force
 respawn" or "Respawn protection" dmflags are enabled

---
 wadsrc/static/zscript/actors/player/player.zs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wadsrc/static/zscript/actors/player/player.zs b/wadsrc/static/zscript/actors/player/player.zs
index a1f35d298..bddbee27c 100644
--- a/wadsrc/static/zscript/actors/player/player.zs
+++ b/wadsrc/static/zscript/actors/player/player.zs
@@ -231,7 +231,7 @@ class PlayerPawn : Actor
 
 	virtual void OnRespawn()
 	{
-		if (sv_respawnprotect && (multiplayer || alwaysapplydmflags))
+		if (sv_respawnprotect && (deathmatch || alwaysapplydmflags))
 		{
 			let invul = Powerup(Spawn("PowerInvulnerable"));
 			invul.EffectTics = 3 * TICRATE;
@@ -718,7 +718,7 @@ class PlayerPawn : Actor
 		}		
 
 		if ((player.cmd.buttons & BT_USE ||
-			((multiplayer || alwaysapplydmflags) && sv_forcerespawn)) && !sv_norespawn)
+			((deathmatch || alwaysapplydmflags) && sv_forcerespawn)) && !sv_norespawn)
 		{
 			if (Level.maptime >= player.respawn_time || ((player.cmd.buttons & BT_USE) && player.Bot == NULL))
 			{