From 93c19c4194b7eb82984bd13349c8ce3953a9ad92 Mon Sep 17 00:00:00 2001 From: ariel- Date: Fri, 28 Apr 2017 02:24:04 -0300 Subject: Core/Misc: camelize GetFaction/SetFaction properly (cherry picked from commit 4c4dca6d694bd1064b403a31a5b1c776a326f3ce) --- src/server/game/Entities/GameObject/GameObject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/Entities/GameObject') diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 4e34c8b4785..1bc8383a51c 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -2112,7 +2112,7 @@ void GameObject::CastSpell(Unit* target, uint32 spellId, TriggerCastFlags trigge if (Unit* owner = GetOwner()) { - trigger->setFaction(owner->getFaction()); + trigger->SetFaction(owner->GetFaction()); if (owner->HasUnitFlag(UNIT_FLAG_PVP_ATTACKABLE)) trigger->AddUnitFlag(UNIT_FLAG_PVP_ATTACKABLE); // copy pvp state flags from owner @@ -2123,7 +2123,7 @@ void GameObject::CastSpell(Unit* target, uint32 spellId, TriggerCastFlags trigge } else { - trigger->setFaction(spellInfo->IsPositive() ? 35 : 14); + trigger->SetFaction(spellInfo->IsPositive() ? 35 : 14); // Set owner guid for target if no owner available - needed by trigger auras // - trigger gets despawned and there's no caster avalible (see AuraEffect::TriggerSpell()) trigger->CastSpell(target ? target : trigger, spellInfo, triggered, nullptr, nullptr, target ? target->GetGUID() : ObjectGuid::Empty); -- cgit v1.2.3