aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/Player.cpp3
-rw-r--r--src/game/Unit.cpp5
2 files changed, 7 insertions, 1 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 5f376b19a91..0c3438ae509 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -16850,7 +16850,8 @@ void Player::StopCastingCharm()
if(GetCharmGUID())
{
- sLog.outCrash("Player %s is not able to uncharm unit (Entry: %u, Type: %u)", GetName(), charm->GetEntry(), charm->GetTypeId());
+ 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);
}
}
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index fa748673eac..93107ecf55f 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -14107,7 +14107,12 @@ void Unit::RemoveCharmedBy(Unit *charmer)
if(!charmer)
charmer = GetCharmer();
else if(charmer != GetCharmer()) // one aura overrides another?
+ {
+ sLog.outCrash("Unit::RemoveCharmedBy: this: " UI64FMTD " true charmer: " UI64FMTD " false charmer: " UI64FMTD,
+ GetGUID(), GetCharmerGUID(), charmer->GetGUID());
+ assert(false);
return;
+ }
CharmType type;
if(hasUnitState(UNIT_STAT_POSSESSED))