mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 10:37:03 +00:00
[10629] Drop function GuidHigh2TypeId
Added ObjectGuid version Aura::GetCasterGuid() But for prevent big problen with backporting AuraHolder to mangos-0.12 in most cases still used old uint64 version Aura::GetCasterGUID. Recommended use new version where possible in clean way as done for some cases in commit already.
This commit is contained in:
parent
fdc5a1dd67
commit
31c9efd219
17 changed files with 54 additions and 66 deletions
|
|
@ -1115,7 +1115,7 @@ void Unit::CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered,
|
|||
if (triggeredByAura)
|
||||
{
|
||||
if(originalCaster.IsEmpty())
|
||||
originalCaster = triggeredByAura->GetCasterGUID();
|
||||
originalCaster = triggeredByAura->GetCasterGuid();
|
||||
|
||||
triggeredBy = triggeredByAura->GetSpellProto();
|
||||
}
|
||||
|
|
@ -1161,7 +1161,7 @@ void Unit::CastCustomSpell(Unit* Victim, SpellEntry const *spellInfo, int32 cons
|
|||
if (triggeredByAura)
|
||||
{
|
||||
if(originalCaster.IsEmpty())
|
||||
originalCaster = triggeredByAura->GetCasterGUID();
|
||||
originalCaster = triggeredByAura->GetCasterGuid();
|
||||
|
||||
triggeredBy = triggeredByAura->GetSpellProto();
|
||||
}
|
||||
|
|
@ -1218,7 +1218,7 @@ void Unit::CastSpell(float x, float y, float z, SpellEntry const *spellInfo, boo
|
|||
if (triggeredByAura)
|
||||
{
|
||||
if(originalCaster.IsEmpty())
|
||||
originalCaster = triggeredByAura->GetCasterGUID();
|
||||
originalCaster = triggeredByAura->GetCasterGuid();
|
||||
|
||||
triggeredBy = triggeredByAura->GetSpellProto();
|
||||
}
|
||||
|
|
@ -7866,7 +7866,7 @@ bool Unit::isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, boo
|
|||
// Hunter mark functionality
|
||||
AuraList const& auras = GetAurasByType(SPELL_AURA_MOD_STALKED);
|
||||
for(AuraList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter)
|
||||
if((*iter)->GetCasterGUID()==u->GetGUID())
|
||||
if ((*iter)->GetCasterGuid() == u->GetObjectGuid())
|
||||
return true;
|
||||
|
||||
// else apply detecting check for stealth
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue