diff options
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 9 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index d362d3a9f2e..e88da62bb2f 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -3281,6 +3281,15 @@ void GameObject::Use(Unit* user) Delete(); return; } + case GAMEOBJECT_TYPE_CAPTURE_POINT: + { + Player* player = user->ToPlayer(); + if (!player) + return; + + AssaultCapturePoint(player); + return; + } case GAMEOBJECT_TYPE_ITEM_FORGE: { GameObjectTemplate const* info = GetGOInfo(); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 3a538372a0b..f001921fbf2 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1597,11 +1597,6 @@ void Spell::EffectOpenLock() return; } } - else if (goInfo->type == GAMEOBJECT_TYPE_CAPTURE_POINT) - { - gameObjTarget->AssaultCapturePoint(player); - return; - } else if (goInfo->type == GAMEOBJECT_TYPE_FLAGSTAND) { //CanUseBattlegroundObject() already called in CheckCast() @@ -1613,11 +1608,6 @@ void Spell::EffectOpenLock() return; } } - else if (goInfo->type == GAMEOBJECT_TYPE_NEW_FLAG) - { - gameObjTarget->Use(player); - return; - } else if (m_spellInfo->Id == 1842 && gameObjTarget->GetGOInfo()->type == GAMEOBJECT_TYPE_TRAP && gameObjTarget->GetOwner()) { gameObjTarget->SetLootState(GO_JUST_DEACTIVATED); |