diff options
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index a49d6ac6d77..af45bbc6eb3 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -16933,8 +16933,13 @@ void Player::StopCastingCharm() if(GetCharmGUID()) { sLog.outCrash("Player %s (GUID: " UI64FMTD " is not able to uncharm unit (GUID: " UI64FMTD " Entry: %u, Type: %u)", GetName(), GetGUID(), GetCharmGUID(), charm->GetEntry(), charm->GetTypeId()); - sLog.outCrash("Charmed unit has charmer guid " UI64FMTD, charm->GetCharmerGUID()); - assert(false); + if(charm->GetCharmerGUID()) + { + sLog.outCrash("Charmed unit has charmer guid " UI64FMTD, charm->GetCharmerGUID()); + assert(false); + } + else + SetCharm(charm, false); } } |