OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix crash when players telefrag each other in DM on map start.

Browse source
This commit is contained in:
Mari the Deer 2021-02-01 23:09:20 +01:00
commit 4b88bcfe8a
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
zscript/swwm_handler.zsc
View file

@ -1500,14 +1500,20 @@ Class SWWMHandler : EventHandler
{
tookdamage[e.Thing.PlayerNumber()] = true;
let s = SWWMStats.Find(e.Thing.player);
s.AddDamageTaken(e.Damage);
if ( e.Damage > s.toptaken ) s.toptaken = e.Damage;
if ( s ) // deathmatch telefrag-on-spawn may cause this to be null
{
s.AddDamageTaken(e.Damage);
if ( e.Damage > s.toptaken ) s.toptaken = e.Damage;
}
}
if ( e.DamageSource && e.DamageSource.player )
{
let s = SWWMStats.Find(e.DamageSource.player);
s.AddDamageDealt(e.Damage);
if ( e.Damage > s.topdealt ) s.topdealt = e.Damage;
if ( s ) // deathmatch telefrag-on-spawn may cause this to be null
{
s.AddDamageDealt(e.Damage);
if ( e.Damage > s.topdealt ) s.topdealt = e.Damage;
}
}
}