From 06fdcb9e18b0739494a444f1f5040abde27872eb Mon Sep 17 00:00:00 2001 From: jackpoz Date: Thu, 7 Jan 2016 19:27:40 +0100 Subject: Merge pull request #16193 from Goatform/3.3.5 Core/GameObjects: Fixed an issue where traps were not redirected to Grounding Totem (cherry picked from commit 2a50ea5cf14e16ee0dda09f3c9090d5541b39b2d) --- src/server/game/Entities/GameObject/GameObject.cpp | 2 ++ 1 file changed, 2 insertions(+) (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 e39a8c96741..02176cca13c 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1854,6 +1854,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()); -- cgit v1.2.3