diff options
| -rw-r--r-- | sql/updates/9237_world_outdoorpvp_template.sql | 16 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptLoader.cpp | 10 |
2 files changed, 10 insertions, 16 deletions
diff --git a/sql/updates/9237_world_outdoorpvp_template.sql b/sql/updates/9237_world_outdoorpvp_template.sql index 9753369cbca..e1199a6798f 100644 --- a/sql/updates/9237_world_outdoorpvp_template.sql +++ b/sql/updates/9237_world_outdoorpvp_template.sql @@ -1,8 +1,8 @@ -DELETE FROM `outdoorpvp_template` WHERE `TypeId` IN (1,2,3,4,5,6);
-INSERT INTO `outdoorpvp_template` (`TypeId`, `ScriptName`, `Comment`) VALUES
-(1, 'outdoorpvp_hp', 'Hellfire Peninsula'),
-(2, 'outdoorpvp_na', 'Nagrand'),
-(3, 'outdoorpvp_tf', 'Terokkar Forest'),
-(4, 'outdoorpvp_zm', 'Zangarmarsh'),
-(5, 'outdoorpvp_si', 'Silithus'),
-(6, 'outdoorpvp_ep', 'Eastern Plaguelands');
+DELETE FROM `outdoorpvp_template` WHERE `TypeId` IN (1,2,3,4,5,6); +INSERT INTO `outdoorpvp_template` (`TypeId`, `ScriptName`, `Comment`) VALUES +(1, 'outdoorpvp_hp', 'Hellfire Peninsula'), +(2, 'outdoorpvp_na', 'Nagrand'), +(3, 'outdoorpvp_tf', 'Terokkar Forest'), +(4, 'outdoorpvp_zm', 'Zangarmarsh'), +(5, 'outdoorpvp_si', 'Silithus'), +(6, 'outdoorpvp_ep', 'Eastern Plaguelands'); diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 292c14f1a22..cc29d4fdc43 100644 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -58,8 +58,7 @@ void AddSC_boss_magmus(); void AddSC_boss_moira_bronzebeard(); void AddSC_boss_tomb_of_seven(); void AddSC_instance_blackrock_depths(); -void AddSC_blackrock_spire(); //Blackrock Spire -void AddSC_boss_drakkisath(); +void AddSC_boss_drakkisath(); //Blackrock Spire void AddSC_boss_halycon(); void AddSC_boss_highlordomokk(); void AddSC_boss_mothersmolderweb(); @@ -71,7 +70,6 @@ void AddSC_boss_quatermasterzigris(); void AddSC_boss_pyroguard_emberseer(); void AddSC_boss_gyth(); void AddSC_boss_rend_blackhand(); -void AddSC_instance_blackrock_spire(); void AddSC_boss_razorgore(); //Blackwing lair void AddSC_boss_vael(); void AddSC_boss_broodlord(); @@ -512,7 +510,6 @@ void AddSC_shadowmoon_valley(); void AddSC_shattrath_city(); void AddSC_terokkar_forest(); void AddSC_zangarmarsh(); -void AddSC_onevents(); // spells void AddSC_deathknight_spell_scripts(); @@ -623,8 +620,7 @@ void AddEasternKingdomsScripts() AddSC_boss_moira_bronzebeard(); AddSC_boss_tomb_of_seven(); AddSC_instance_blackrock_depths(); - AddSC_blackrock_spire(); //Blackrock Spire - AddSC_boss_drakkisath(); + AddSC_boss_drakkisath(); //Blackrock Spire AddSC_boss_halycon(); AddSC_boss_highlordomokk(); AddSC_boss_mothersmolderweb(); @@ -636,7 +632,6 @@ void AddEasternKingdomsScripts() AddSC_boss_pyroguard_emberseer(); AddSC_boss_gyth(); AddSC_boss_rend_blackhand(); - AddSC_instance_blackrock_spire(); AddSC_boss_razorgore(); //Blackwing lair AddSC_boss_vael(); AddSC_boss_broodlord(); @@ -963,7 +958,6 @@ void AddOutlandScripts() AddSC_shattrath_city(); AddSC_terokkar_forest(); AddSC_zangarmarsh(); - AddSC_onevents(); #endif } |