From 13b6d34a7f0b3c25200fa477e3549ed0b4316872 Mon Sep 17 00:00:00 2001
From: mik1893 <michele.roscelli@gmail.com>
Date: Sun, 10 Jul 2016 13:24:51 +0100
Subject: [PATCH] Added custom scripts to azeroth module - disabled anticheat
 (for now)

---
 .../azerothshard/src/server/plugins/AzthPlgLoader.cpp  | 10 ++++++----
 .../azerothshard/src/server/plugins/npc_guildhouse.cpp |  2 +-
 src/server/game/Scripting/ScriptLoader.cpp             |  4 ----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/azerothshard/src/server/plugins/AzthPlgLoader.cpp b/modules/azerothshard/src/server/plugins/AzthPlgLoader.cpp
index 4def7e8be0..b3bbf266ce 100644
--- a/modules/azerothshard/src/server/plugins/AzthPlgLoader.cpp
+++ b/modules/azerothshard/src/server/plugins/AzthPlgLoader.cpp
@@ -1,4 +1,5 @@
 #include "AzthPlgLoader.h"
+#include "AnticheatMgr.h"
 #include "Log.h"
 
 #ifndef SCRIPTLOADER_CPP
@@ -13,8 +14,9 @@
 // void AddSC_CS_Transmogrification();
 // void AddSC_npc_1v1arena();
 void AddSC_npc_lottery();
-void AddSC_anticheat_commandscript();
+//void AddSC_anticheat_commandscript();
 void AddSC_guildhouse_npcs();
+void AddSC_npc_transmogrifier();
 
 
 void AddAzthScripts()
@@ -25,12 +27,12 @@ void AddAzthScripts()
 //     AddSC_CrossFactionGroups();
 //     AddSC_azth_player_plg();
 //     AddSC_Custom_Rates();
-//     AddSC_PWS_Transmogrification();
-//     AddSC_CS_Transmogrification();
 //     AddSC_npc_1v1arena();
 	AddSC_npc_lottery();
-    AddSC_anticheat_commandscript();
+    //AddSC_anticheat_commandscript();
     AddSC_guildhouse_npcs();
+    AddSC_npc_transmogrifier();
+    //sAnticheatMgr->StartScripts(); //[AZTH] Anticheat
 }
 
 
diff --git a/modules/azerothshard/src/server/plugins/npc_guildhouse.cpp b/modules/azerothshard/src/server/plugins/npc_guildhouse.cpp
index 37b6c2d001..c1529c4963 100644
--- a/modules/azerothshard/src/server/plugins/npc_guildhouse.cpp
+++ b/modules/azerothshard/src/server/plugins/npc_guildhouse.cpp
@@ -1286,5 +1286,5 @@ void AddSC_guildhouse_npcs()
 	new guild_guard();
 	new npc_buffnpc();
 	new npc_portal();
-	//new npc_teleport();
+	new npc_teleport();
 }
\ No newline at end of file
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 00d981ceee..81a724a9d4 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -17,7 +17,6 @@
 
 #include "ScriptLoader.h"
 #include "ScriptMgr.h"
-#include "AnticheatMgr.h" //[AZTH]
 
 //examples
 void AddSC_example_creature();
@@ -89,7 +88,6 @@ void AddSC_npc_innkeeper();
 void AddSC_npcs_special();
 void AddSC_npc_taxi();
 void AddSC_achievement_scripts();
-void AddSC_npc_transmogrifier();
 
 //events
 void AddSC_event_brewfest_scripts();
@@ -595,7 +593,6 @@ void AddScripts()
     AddSpellScripts();
     AddSC_SmartSCripts();
     AddCommandScripts();
-    sAnticheatMgr->StartScripts(); //[AZTH] Anticheat
 #ifdef SCRIPTS
     AddWorldScripts();
     AddEventScripts();
@@ -711,7 +708,6 @@ void AddWorldScripts()
     AddSC_npcs_special();
     AddSC_npc_taxi();
     AddSC_achievement_scripts();
-    AddSC_npc_transmogrifier();
 #endif
 }