From 73f73cdf7cfe24083063b218b3e325fdaeedd950 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 12 Aug 2021 20:28:04 +0200
Subject: [PATCH] - added a null check to CheckWeaponChange.

---
 wadsrc/static/zscript/actors/player/player.zs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wadsrc/static/zscript/actors/player/player.zs b/wadsrc/static/zscript/actors/player/player.zs
index 67b07b2828..e63a5d7733 100644
--- a/wadsrc/static/zscript/actors/player/player.zs
+++ b/wadsrc/static/zscript/actors/player/player.zs
@@ -456,6 +456,7 @@ class PlayerPawn : Actor
 	virtual void CheckWeaponChange ()
 	{
 		let player = self.player;
+		if (!player) return;	
 		if ((player.WeaponState & WF_DISABLESWITCH) || // Weapon changing has been disabled.
 			player.morphTics != 0)					// Morphed classes cannot change weapons.
 		{ // ...so throw away any pending weapon requests.