*Use map pointer of killed creature instead of player pointer to prevent crash in case killer is not in world.

--HG--
branch : trunk

1 files changed, 1 insertions, 0 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 66a06135ec5..24128fc85c5 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -13668,6 +13668,7 @@ void Unit::SetToNotify()
 
 void Unit::Kill(Unit *pVictim, bool durabilityLoss)
 {
+    assert(pVictim->IsInWorld() && pVictim->FindMap());
     // Prevent killing unit twice (and giving reward from kill twice)
     if (!pVictim->GetHealth())
         return;