diff options
| -rw-r--r-- | src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp | 4 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp index 2ac90b87c35..a436c97029f 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp @@ -331,7 +331,7 @@ struct TRINITY_DLL_DECL boss_kalecgosKJAI : public ScriptedAI cell.SetNoCreate(); std::list<GameObject*> orbList; AllOrbsInGrid check; - Trinity::GameObjectListSearcher<AllOrbsInGrid> searcher(orbList, check); + Trinity::GameObjectListSearcher<AllOrbsInGrid> searcher(me, orbList, check); TypeContainerVisitor<Trinity::GameObjectListSearcher<AllOrbsInGrid>, GridTypeMapContainer> visitor(searcher); CellLock<GridReadGuard> cell_lock(cell, pair); cell_lock->Visit(cell_lock, visitor, *(m_creature->GetMap())); @@ -855,7 +855,7 @@ struct TRINITY_DLL_DECL mob_hand_of_the_deceiverAI : public ScriptedAI } void UpdateAI(const uint32 diff){ - if(!InCombat) + if(!me->isInCombat()) DoCast(m_creature, SPELL_SHADOW_CHANNELING); if(!UpdateVictim()) diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp index ee4ceb61780..f8bba5acf21 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp @@ -119,20 +119,6 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance return NULL; } - void HandleGameObject(uint64 guid, uint32 state) - { - Player *player = GetPlayerInMap(); - - if (!player || !guid) - { - debug_log("TSCR: Sunwell Plateau: HandleGameObject fail"); - return; - } - - if (GameObject *go = GameObject::GetGameObject(*player,guid)) - go->SetGoState(state); - } - void OnCreatureCreate(Creature* creature, uint32 entry) { switch(entry) |