aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-11-14 01:53:25 -0300
committerjoschiwald <joschiwald.trinity@gmail.com>2017-12-30 21:32:08 +0100
commit0c81d70394de2f11172586dbb1a1ecb5989eb81a (patch)
tree3d701c3b9da232053b5d02cb712a6ed48bacc107
parente5a21fb6ce68ce975cd3b894fce9969145330daf (diff)
Core/GameObject: use a friendly trigger for positive spells.
Fixes an issue with Skadi Harpoons. Note to self: should actually implement GameObject casting already :/ (cherry picked from commit 3f1d020a2cee1436c5e0c891bc7a63147659b497)
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 4839afea43f..b5af98169ce 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -1981,7 +1981,7 @@ void GameObject::CastSpell(Unit* target, uint32 spellId, TriggerCastFlags trigge
}
else
{
- trigger->setFaction(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);