From ea9dd78d3502566f1695e0cee3e7e5b3e5e57a9d Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sun, 6 Jun 2010 17:45:53 +0400 Subject: [PATCH] [10034] In case unknown triggered spell output more known info for location problem. --- src/game/Unit.cpp | 30 ++++++++++++++++++++++++------ src/shared/revision_nr.h | 2 +- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 08e46b046..772308465 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1066,7 +1066,10 @@ void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castIte if(!spellInfo) { - sLog.outError("CastSpell: unknown spell id %i by caster: %s", spellId, GetObjectGuid().GetString().c_str()); + if (triggeredByAura) + sLog.outError("CastSpell: unknown spell id %i by caster: %s triggered by aura %u (eff %u)", spellId, GetObjectGuid().GetString().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex()); + else + sLog.outError("CastSpell: unknown spell id %i by caster: %s", spellId, GetObjectGuid().GetString().c_str()); return; } @@ -1077,7 +1080,10 @@ void Unit::CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered, { if(!spellInfo) { - sLog.outError("CastSpell: unknown spell by caster: %s", GetObjectGuid().GetString().c_str()); + if (triggeredByAura) + sLog.outError("CastSpell: unknown spell by caster: %s triggered by aura %u (eff %u)", GetObjectGuid().GetString().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex()); + else + sLog.outError("CastSpell: unknown spell by caster: %s", GetObjectGuid().GetString().c_str()); return; } @@ -1101,7 +1107,10 @@ void Unit::CastCustomSpell(Unit* Victim,uint32 spellId, int32 const* bp0, int32 if(!spellInfo) { - sLog.outError("CastCustomSpell: unknown spell id %i by caster: %s", spellId, GetObjectGuid().GetString().c_str()); + if (triggeredByAura) + sLog.outError("CastCustomSpell: unknown spell id %i by caster: %s triggered by aura %u (eff %u)", spellId, GetObjectGuid().GetString().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex()); + else + sLog.outError("CastCustomSpell: unknown spell id %i by caster: %s", spellId, GetObjectGuid().GetString().c_str()); return; } @@ -1112,7 +1121,10 @@ void Unit::CastCustomSpell(Unit* Victim, SpellEntry const *spellInfo, int32 cons { if(!spellInfo) { - sLog.outError("CastCustomSpell: unknown spell by caster: %s", GetObjectGuid().GetString().c_str()); + if (triggeredByAura) + sLog.outError("CastCustomSpell: unknown spell by caster: %s triggered by aura %u (eff %u)", GetObjectGuid().GetString().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex()); + else + sLog.outError("CastCustomSpell: unknown spell by caster: %s", GetObjectGuid().GetString().c_str()); return; } @@ -1146,7 +1158,10 @@ void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered, if(!spellInfo) { - sLog.outError("CastSpell(x,y,z): unknown spell id %i by caster: %s", spellId, GetObjectGuid().GetString().c_str()); + if (triggeredByAura) + sLog.outError("CastSpell(x,y,z): unknown spell id %i by caster: %s triggered by aura %u (eff %u)", spellId, GetObjectGuid().GetString().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex()); + else + sLog.outError("CastSpell(x,y,z): unknown spell id %i by caster: %s", spellId, GetObjectGuid().GetString().c_str()); return; } @@ -1158,7 +1173,10 @@ void Unit::CastSpell(float x, float y, float z, SpellEntry const *spellInfo, boo { if(!spellInfo) { - sLog.outError("CastSpell(x,y,z): unknown spell by caster: %s", GetObjectGuid().GetString().c_str()); + if (triggeredByAura) + sLog.outError("CastSpell(x,y,z): unknown spell by caster: %s triggered by aura %u (eff %u)", GetObjectGuid().GetString().c_str(), triggeredByAura->GetId(), triggeredByAura->GetEffIndex()); + else + sLog.outError("CastSpell(x,y,z): unknown spell by caster: %s", GetObjectGuid().GetString().c_str()); return; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index e08f10e15..4fd5c8c3b 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10033" + #define REVISION_NR "10034" #endif // __REVISION_NR_H__