- added a null check to CheckWeaponChange.

ZDoom · Aug 12, 2021 · 73f73cd · 73f73cd
1 parent f9f48c4
commit 73f73cd
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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.