aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2016-01-07 19:27:40 +0100
committerjackpoz <giacomopoz@gmail.com>2016-01-07 19:27:40 +0100
commit2a50ea5cf14e16ee0dda09f3c9090d5541b39b2d (patch)
treea58ebd218732897141a81001002ef6025bed7fd4
parent5d9370a0f755887d2fff13e4ce982bd52f00f77b (diff)
parent42594c16873328e5e17121597e13f5db95ed12ab (diff)
Merge pull request #16193 from Goatform/3.3.5
Core/GameObjects: Fixed an issue where traps were not redirected to Grounding Totem
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 9aabed67243..6f0b9f89e44 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -1803,6 +1803,8 @@ void GameObject::CastSpell(Unit* target, uint32 spellId, bool triggered /*= true
if (Unit* owner = GetOwner())
{
trigger->setFaction(owner->getFaction());
+ if (owner->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE))
+ trigger->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
// needed for GO casts for proper target validation checks
trigger->SetOwnerGUID(owner->GetGUID());
trigger->CastSpell(target ? target : trigger, spellInfo, triggered, nullptr, nullptr, owner->GetGUID());