diff options
| author | Dennis Felsing <dennis@felsin9.de> | 2023-07-11 10:11:44 +0200 |
|---|---|---|
| committer | Dennis Felsing <dennis@felsin9.de> | 2023-07-11 10:11:44 +0200 |
| commit | 431950c3fcc6ef37dc87f910d596bbbe776efe1e (patch) | |
| tree | 26e7bc172027b48a01b894ed18e5b6650bf4f814 | |
| parent | c1f733a239508feee501894306e22f05a43475d1 (diff) | |
| download | zcatch-431950c3fcc6ef37dc87f910d596bbbe776efe1e.tar.gz zcatch-431950c3fcc6ef37dc87f910d596bbbe776efe1e.zip | |
Fix segfault in TakeDamage (fixes #3)
| -rw-r--r-- | src/game/server/entities/character.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |