Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/Spells/spell_generic.cpp

1 files changed, 37 insertions, 106 deletions

diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index 1847e3390ef..87533fbe47d 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -18,9 +18,6 @@
 
 /* ContentData
 go_cat_figurine (the "trap" version of GO, two different exist)
-go_northern_crystal_pylon
-go_eastern_crystal_pylon
-go_western_crystal_pylon
 go_barov_journal
 go_ethereum_prison
 go_ethereum_stasis
@@ -80,69 +77,6 @@ public:
 };
 
 /*######
-## go_crystal_pylons (3x)
-######*/
-class go_northern_crystal_pylon : public GameObjectScript
-{
-public:
-    go_northern_crystal_pylon() : GameObjectScript("go_northern_crystal_pylon") { }
-
-    bool OnGossipHello(Player* player, GameObject* go) OVERRIDE
-    {
-        if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
-        {
-            player->PrepareQuestMenu(go->GetGUID());
-            player->SendPreparedQuest(go->GetGUID());
-        }
-
-        if (player->GetQuestStatus(4285) == QUEST_STATUS_INCOMPLETE)
-            player->AreaExploredOrEventHappens(4285);
-
-        return true;
-    }
-};
-
-class go_eastern_crystal_pylon : public GameObjectScript
-{
-public:
-    go_eastern_crystal_pylon() : GameObjectScript("go_eastern_crystal_pylon") { }
-
-    bool OnGossipHello(Player* player, GameObject* go) OVERRIDE
-    {
-        if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
-        {
-            player->PrepareQuestMenu(go->GetGUID());
-            player->SendPreparedQuest(go->GetGUID());
-        }
-
-        if (player->GetQuestStatus(4287) == QUEST_STATUS_INCOMPLETE)
-            player->AreaExploredOrEventHappens(4287);
-
-        return true;
-    }
-};
-
-class go_western_crystal_pylon : public GameObjectScript
-{
-public:
-    go_western_crystal_pylon() : GameObjectScript("go_western_crystal_pylon") { }
-
-    bool OnGossipHello(Player* player, GameObject* go) OVERRIDE
-    {
-        if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
-        {
-            player->PrepareQuestMenu(go->GetGUID());
-            player->SendPreparedQuest(go->GetGUID());
-        }
-
-        if (player->GetQuestStatus(4288) == QUEST_STATUS_INCOMPLETE)
-            player->AreaExploredOrEventHappens(4288);
-
-        return true;
-    }
-};
-
-/*######
 ## go_barov_journal
 ######*/
 
@@ -1375,44 +1309,41 @@ public:
 
 void AddSC_go_scripts()
 {
-    new go_cat_figurine;
-    new go_northern_crystal_pylon;
-    new go_eastern_crystal_pylon;
-    new go_western_crystal_pylon;
-    new go_barov_journal;
-    new go_field_repair_bot_74A;
-    new go_gilded_brazier;
-    new go_orb_of_command;
-    new go_shrine_of_the_birds;
-    new go_southfury_moonstone;
-    new go_tablet_of_madness;
-    new go_tablet_of_the_seven;
-    new go_jump_a_tron;
-    new go_ethereum_prison;
-    new go_ethereum_stasis;
-    new go_resonite_cask;
-    new go_sacred_fire_of_life;
-    new go_tele_to_dalaran_crystal;
-    new go_tele_to_violet_stand;
-    new go_fel_crystalforge;
-    new go_bashir_crystalforge;
-    new go_matrix_punchograph;
-    new go_scourge_cage;
-    new go_arcane_prison;
-    new go_blood_filled_orb;
-    new go_jotunheim_cage;
-    new go_table_theka;
-    new go_inconspicuous_landmark;
-    new go_ethereal_teleport_pad;
-    new go_soulwell;
-    new go_tadpole_cage;
-    new go_dragonflayer_cage;
-    new go_amberpine_outhouse;
-    new go_hive_pod;
-    new go_massive_seaforium_charge;
-    new go_gjalerbron_cage;
-    new go_large_gjalerbron_cage;
-    new go_veil_skith_cage;
-    new go_frostblade_shrine;
-    new go_midsummer_bonfire;
+    new go_cat_figurine();
+    new go_barov_journal();
+    new go_field_repair_bot_74A();
+    new go_gilded_brazier();
+    new go_orb_of_command();
+    new go_shrine_of_the_birds();
+    new go_southfury_moonstone();
+    new go_tablet_of_madness();
+    new go_tablet_of_the_seven();
+    new go_jump_a_tron();
+    new go_ethereum_prison();
+    new go_ethereum_stasis();
+    new go_resonite_cask();
+    new go_sacred_fire_of_life();
+    new go_tele_to_dalaran_crystal();
+    new go_tele_to_violet_stand();
+    new go_fel_crystalforge();
+    new go_bashir_crystalforge();
+    new go_matrix_punchograph();
+    new go_scourge_cage();
+    new go_arcane_prison();
+    new go_blood_filled_orb();
+    new go_jotunheim_cage();
+    new go_table_theka();
+    new go_inconspicuous_landmark();
+    new go_ethereal_teleport_pad();
+    new go_soulwell();
+    new go_tadpole_cage();
+    new go_dragonflayer_cage();
+    new go_amberpine_outhouse();
+    new go_hive_pod();
+    new go_massive_seaforium_charge();
+    new go_gjalerbron_cage();
+    new go_large_gjalerbron_cage();
+    new go_veil_skith_cage();
+    new go_frostblade_shrine();
+    new go_midsummer_bonfire();
 }