diff options
| author | jackpoz <giacomopoz@gmail.com> | 2016-01-07 19:27:40 +0100 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2016-01-20 21:55:50 +0100 |
| commit | 06fdcb9e18b0739494a444f1f5040abde27872eb (patch) | |
| tree | f8bc996222ff10df511bb24ff2df44f00e240fc0 /src | |
| parent | ea2c2c9763f6d8bc2ea1edf385c48d0d320b176b (diff) | |
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 2 |
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 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()); |