diff options
| author | Dominik Geyer <dominik.geyer@gmx.de> | 2008-10-15 16:43:25 +0000 |
|---|---|---|
| committer | Dominik Geyer <dominik.geyer@gmx.de> | 2008-10-15 16:43:25 +0000 |
| commit | 03f6d24ba11f72751bc8ad5119f3db1c0c73dbcc (patch) | |
| tree | 3a1d4bd190108a1c436419982c2670e9d6289487 /src/game/server/entities | |
| parent | cae288fa728aa8cfe29f2fdebe6b329e60b07691 (diff) | |
| download | zcatch-03f6d24ba11f72751bc8ad5119f3db1c0c73dbcc.tar.gz zcatch-03f6d24ba11f72751bc8ad5119f3db1c0c73dbcc.zip | |
fixed server-crash on death race-condition; ticket #494
Diffstat (limited to 'src/game/server/entities')
| -rw-r--r-- | src/game/server/entities/character.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 07f4ebbf..cc0145b0 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -811,8 +811,11 @@ bool CHARACTER::take_damage(vec2 force, int dmg, int from, int weapon) if (from >= 0 && from != player->client_id) { CHARACTER *chr = game.players[from]->get_character(); - chr->emote_type = EMOTE_HAPPY; - chr->emote_stop = server_tick() + server_tickspeed(); + if (chr) + { + chr->emote_type = EMOTE_HAPPY; + chr->emote_stop = server_tick() + server_tickspeed(); + } } return false; |