Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
This commit is contained in:
commit
689b7f6d56
17 files changed
+271
-8
No files matched your search
+1
-1
@@ -204,7 +204,7 @@ class instance_culling_of_stratholme : public InstanceMapScript
|
||||
if (state == DONE)
|
||||
{
|
||||
if (GameObject* go = instance->GetGameObject(_malGanisChestGUID))
|
||||
go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND);
|
||||
go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
|
||||
instance->SummonCreature(NPC_CHROMIE_3, ChromieSummonPos[1]);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -91,7 +91,7 @@ class instance_halls_of_stone : public InstanceMapScript
|
||||
case GO_TRIBUNAL_CHEST_HERO:
|
||||
TribunalChestGUID = go->GetGUID();
|
||||
if (GetBossState(DATA_BRANN_EVENT) == DONE)
|
||||
go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND);
|
||||
go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
|
||||
break;
|
||||
case GO_TRIBUNAL_SKY_FLOOR:
|
||||
TribunalSkyFloorGUID = go->GetGUID();
|
||||
@@ -160,7 +160,7 @@ class instance_halls_of_stone : public InstanceMapScript
|
||||
if (state == DONE)
|
||||
{
|
||||
if (GameObject* go = instance->GetGameObject(TribunalChestGUID))
|
||||
go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND);
|
||||
go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
||||
@@ -72,7 +72,7 @@ public:
|
||||
struct boss_darkweaver_sythAI : public BossAI
|
||||
{
|
||||
boss_darkweaver_sythAI(Creature* creature) : BossAI(creature, DATA_DARKWEAVER_SYTH)
|
||||
{
|
||||
{
|
||||
Initialize();
|
||||
}
|
||||
|
||||
|
||||
@@ -117,7 +117,7 @@ public:
|
||||
|
||||
void Reset() override
|
||||
{
|
||||
ReliquaryGUID.Clear();
|
||||
ReliquaryGUID.Clear();
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) override
|
||||
|
||||
Reference in new issue
Block a user