diff options
| -rw-r--r-- | sql/FULL/world_scripts_full.sql | 4 | ||||
| -rw-r--r-- | sql/updates/7423_world_areatrigger_scripts.sql | 2 | ||||
| -rw-r--r-- | src/scripts/northrend/naxxramas/instance_naxxramas.cpp | 19 |
3 files changed, 2 insertions, 23 deletions
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql index 3d3299f8609..dd9ae863af0 100644 --- a/sql/FULL/world_scripts_full.sql +++ b/sql/FULL/world_scripts_full.sql @@ -1450,10 +1450,6 @@ UPDATE `creature_template` SET `ScriptName`='mob_ohgan' WHERE `entry`=14988; UPDATE `creature_template` SET `ScriptName` = 'npc_skywing' WHERE `entry`=22424; -DELETE FROM areatrigger_scripts WHERE `entry`=4156; -INSERT INTO areatrigger_scripts VALUES - (4156,'at_naxxramas_frostwyrm_wing'); - DELETE FROM areatrigger_scripts WHERE `entry`=3066; INSERT INTO areatrigger_scripts VALUES (3066,'at_ravenholdt'); diff --git a/sql/updates/7423_world_areatrigger_scripts.sql b/sql/updates/7423_world_areatrigger_scripts.sql new file mode 100644 index 00000000000..8f63ca6a8d9 --- /dev/null +++ b/sql/updates/7423_world_areatrigger_scripts.sql @@ -0,0 +1,2 @@ +-- delete naxxramas areatrigger to get to frostwyrm wing (no longer needed in 3.3.2) +DELETE FROM areatrigger_scripts WHERE `entry`=4156; diff --git a/src/scripts/northrend/naxxramas/instance_naxxramas.cpp b/src/scripts/northrend/naxxramas/instance_naxxramas.cpp index 4eb62b6d26e..4ce5361988c 100644 --- a/src/scripts/northrend/naxxramas/instance_naxxramas.cpp +++ b/src/scripts/northrend/naxxramas/instance_naxxramas.cpp @@ -223,20 +223,6 @@ struct instance_naxxramas : public InstanceData } }; -bool AreaTrigger_at_naxxramas_frostwyrm_wing(Player* pPlayer, const AreaTriggerEntry *at) -{ - if (pPlayer->isGameMaster()) - return false; - - InstanceData *data = pPlayer->GetInstanceData(); - if (data) - for (uint32 i = BOSS_ANUBREKHAN; i < BOSS_SAPPHIRON; ++i) - if (data->GetBossState(i) != DONE) - return true; - - return false; -} - InstanceData* GetInstanceData_instance_naxxramas(Map* pMap) { return new instance_naxxramas(pMap); @@ -249,9 +235,4 @@ void AddSC_instance_naxxramas() newscript->Name = "instance_naxxramas"; newscript->GetInstanceData = &GetInstanceData_instance_naxxramas; newscript->RegisterSelf(); - - newscript = new Script; - newscript->Name = "at_naxxramas_frostwyrm_wing"; - newscript->pAreaTrigger = &AreaTrigger_at_naxxramas_frostwyrm_wing; - newscript->RegisterSelf(); } |