aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/Player.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index e5c046034f4..5b5c859097f 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1330,8 +1330,14 @@ void Player::setDeathState(DeathState s)
bool cur = isAlive();
- if(s == JUST_DIED && cur)
+ if(s == JUST_DIED)
{
+ if(!cur)
+ {
+ sLog.outError("setDeathState: attempt to kill a dead player %s(%d)", GetName(), GetGUIDLow());
+ return;
+ }
+
// drunken state is cleared on death
SetDrunkValue(0);
// lost combo points at any target (targeted combo points clear in Unit::setDeathState)