diff options
| -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; |