From 431950c3fcc6ef37dc87f910d596bbbe776efe1e Mon Sep 17 00:00:00 2001 From: Dennis Felsing Date: Tue, 11 Jul 2023 10:11:44 +0200 Subject: Fix segfault in TakeDamage (fixes #3) --- src/game/server/entities/character.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index cc51d856..ed0d9ea5 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -885,7 +885,7 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon) if(g_Config.m_SvMode == 4 && Weapon == WEAPON_GRENADE && Dmg < g_Config.m_SvGrenadeMinDamage) return false; - if(g_Config.m_SvRespawnProtection && From >= 0 && (m_pPlayer->m_RespawnProtection > Server()->Tick() || GameServer()->m_apPlayers[From]->m_RespawnProtection > Server()->Tick())) + if(g_Config.m_SvRespawnProtection && From >= 0 && GameServer()->m_apPlayers[From] && (m_pPlayer->m_RespawnProtection > Server()->Tick() || GameServer()->m_apPlayers[From]->m_RespawnProtection > Server()->Tick())) return false; m_Health = 0; m_Armor = 0; -- cgit 1.4.1