From ad06d26b28ffac978789ac112bb3589c739f051e Mon Sep 17 00:00:00 2001
From: DantestyleXD <Null-fox@hotmail.it>
Date: Tue, 23 Aug 2016 23:31:24 +0200
Subject: [PATCH 01/21] [DB/Quest] There Exists No Honor Among Birds

---
 data/sql/updates/world/2016_08_23_00.sql | 146 +++++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 data/sql/updates/world/2016_08_23_00.sql

diff --git a/data/sql/updates/world/2016_08_23_00.sql b/data/sql/updates/world/2016_08_23_00.sql
new file mode 100644
index 000000000..e60b2a8c2
--- /dev/null
+++ b/data/sql/updates/world/2016_08_23_00.sql
@@ -0,0 +1,146 @@
+
+ALTER TABLE world_db_version CHANGE COLUMN 2016_08_19_01 2016_08_23_00;
+
+/*
+Issue: #89 (https://github.com/AzerothShard/AzerothShard-Issues-ita/issues/89)
+Missing auras and flags on main NPCs and waypoints for enemy NPCs
+*/
+
+DELETE FROM `creature_template_addon` WHERE `entry`=24783;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(24783, 0, 0, 0, 1, 0, 43775);
+
+-- Fjord Hawk Matriarch
+UPDATE `creature_template` SET `InhabitType`='5' WHERE  `entry`=24787;
+-- Pathing for Entry: 24787 'TDB FORMAT' 
+SET @NPC := 115835;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=491.5974,`position_y`=-6158.39,`position_z`=144.1042 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '43775');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,491.5974,-6158.39,144.1042,0,0,1,0,100,0),
+(@PATH,2,509.5939,-6162.629,111.2709,0,0,1,0,100,0),
+(@PATH,3,526.574,-6162.785,95.60418,0,0,1,0,100,0),
+(@PATH,4,574.4791,-6163.997,95.60418,0,0,1,0,100,0),
+(@PATH,5,603.0228,-6169.135,135.1598,0,0,1,0,100,0),
+(@PATH,6,621.6965,-6158.342,152.5963,0,0,1,0,100,0),
+(@PATH,7,637.6,-6155.499,154.6354,0,0,1,0,100,0),
+(@PATH,8,663.0421,-6125.693,179.4132,0,0,1,0,100,0),
+(@PATH,9,656.72,-6138.115,215.4652,0,0,1,0,100,0),
+(@PATH,10,639.1322,-6143.215,215.4652,0,0,1,0,100,0),
+(@PATH,11,618.7733,-6150.35,208.0208,0,0,1,0,100,0),
+(@PATH,12,588.9388,-6145.327,208.0208,0,0,1,0,100,0),
+(@PATH,13,554.6487,-6152.367,187.5208,0,0,1,0,100,0),
+(@PATH,14,528.2413,-6138.124,166.6597,0,0,1,0,100,0),
+(@PATH,15,497.937,-6157.058,187.5208,0,0,1,0,100,0),
+(@PATH,16,482.7061,-6146.376,174.6875,0,0,1,0,100,0),
+(@PATH,17,491.5974,-6158.39,144.1042,0,0,1,0,100,0);
+
+-- Pathing for Entry: 24787 'TDB FORMAT' 
+SET @NPC := 115836;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=520.6224,`position_y`=-6137.84,`position_z`=169.3022 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '43775');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,520.6224,-6137.84,169.3022,0,0,1,0,100,0),
+(@PATH,2,539.8384,-6131.232,149.1912,0,0,1,0,100,0),
+(@PATH,3,520.709,-6158.917,160.4134,0,0,1,0,100,0),
+(@PATH,4,485.8767,-6155.685,160.4134,0,0,1,0,100,0),
+(@PATH,5,438.8145,-6158.287,160.4134,0,0,1,0,100,0),
+(@PATH,6,419.3206,-6156.742,160.4134,0,0,1,0,100,0),
+(@PATH,7,390.6546,-6143.165,160.4134,0,0,1,0,100,0),
+(@PATH,8,377.2733,-6114.98,160.4134,0,0,1,0,100,0),
+(@PATH,9,383.0898,-6128.999,185.83,0,0,0,1,100,0),
+(@PATH,10,417.4906,-6154.904,185.83,0,0,1,0,100,0),
+(@PATH,11,452.2428,-6147.803,185.83,0,0,1,0,100,0),
+(@PATH,12,497.4655,-6150.674,185.83,0,0,1,0,100,0),
+(@PATH,13,520.6224,-6137.84,169.3022,0,0,1,0,100,0);
+
+-- Pathing for Entry: 24787 'TDB FORMAT' 
+SET @NPC := 115837;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=596.8774,`position_y`=-6114.975,`position_z`=271.1343 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '43775');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,596.8774,-6114.975,271.1343,0,0,1,0,100,0),
+(@PATH,2,595.4591,-6109.405,278.3748,0,0,1,0,100,0),
+(@PATH,3,571.2776,-6109.743,290.4025,0,0,1,0,100,0),
+(@PATH,4,556.7193,-6108.814,297.3566,0,0,1,0,100,0),
+(@PATH,5,517.0029,-6104.844,297.3566,0,0,1,0,100,0),
+(@PATH,6,503.9214,-6117.692,297.3566,0,0,1,0,100,0),
+(@PATH,7,466.3313,-6107.801,271.1343,0,0,1,0,100,0),
+(@PATH,8,475.6375,-6120.523,271.1343,0,0,1,0,100,0),
+(@PATH,9,500.4033,-6130.543,271.1343,0,0,1,0,100,0),
+(@PATH,10,542.1522,-6114.92,271.1343,0,0,1,0,100,0),
+(@PATH,11,567.1166,-6129.524,271.1343,0,0,1,0,100,0),
+(@PATH,12,596.8774,-6114.975,271.1343,0,0,1,0,100,0);
+
+-- Pathing for Entry: 24787 'TDB FORMAT' 
+SET @NPC := 115843;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=290.8945,`position_y`=-6070.151,`position_z`=84.36917 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '43775');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,290.8945,-6070.151,84.36917,0,0,1,0,100,0),
+(@PATH,2,273.076,-6034.628,84.36917,0,0,1,0,100,0),
+(@PATH,3,268.3575,-6009.71,121.8221,0,0,1,0,100,0),
+(@PATH,4,282.7736,-6034.701,150.6469,0,0,1,0,100,0),
+(@PATH,5,297.921,-6060.3,111.1191,0,0,1,0,100,0),
+(@PATH,6,324.4433,-6101.173,115.008,0,0,1,0,100,0),
+(@PATH,7,351.7174,-6115.625,115.008,0,0,1,0,100,0),
+(@PATH,8,380.059,-6146.51,102.4525,0,0,1,0,100,0),
+(@PATH,9,381.592,-6162.233,80.36916,0,0,1,0,100,0),
+(@PATH,10,363.2276,-6145.913,80.36916,0,0,1,0,100,0),
+(@PATH,11,338.3981,-6105.44,80.36916,0,0,1,0,100,0),
+(@PATH,12,319.2164,-6096.714,84.36917,0,0,1,0,100,0),
+(@PATH,13,290.8945,-6070.151,84.36917,0,0,1,0,100,0);
+
+-- Pathing for Entry: 24787 'TDB FORMAT' 
+SET @NPC := 115845;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=360.9156,`position_y`=-6061.682,`position_z`=302.8403 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '43775');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,360.9156,-6061.682,302.8403,0,0,1,0,100,0),
+(@PATH,2,389.247,-6078.495,302.8403,0,0,1,0,100,0),
+(@PATH,3,392.2037,-6094.839,296.007,0,0,1,0,100,0),
+(@PATH,4,374.589,-6096.534,288.5903,0,0,1,0,100,0),
+(@PATH,5,358.6935,-6082.393,274.9237,0,0,1,0,100,0),
+(@PATH,6,338.8949,-6049.761,274.9237,0,0,1,0,100,0),
+(@PATH,7,320.3495,-6021.407,274.9237,0,0,1,0,100,0),
+(@PATH,8,306.0276,-5998.132,285.257,0,0,1,0,100,0),
+(@PATH,9,313.4884,-5983.751,285.2291,0,0,1,0,100,0),
+(@PATH,10,320.7385,-5972.151,286.1277,0,0,1,0,100,0),
+(@PATH,11,330.6828,-6007.996,302.8403,0,0,1,0,100,0),
+(@PATH,12,349.4529,-6033.62,302.8403,0,0,1,0,100,0),
+(@PATH,13,360.9156,-6061.682,302.8403,0,0,1,0,100,0);
+
+-- Pathing for Entry: 24787 'TDB FORMAT' 
+SET @NPC := 115844;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=389.949,`position_y`=-6113.926,`position_z`=217.1557 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '43775');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,389.949,-6113.926,217.1557,0,0,1,0,100,0),
+(@PATH,2,365.9727,-6083.048,249.1279,0,0,1,0,100,0),
+(@PATH,3,348.9503,-6058.797,249.1279,0,0,1,0,100,0),
+(@PATH,4,334.4755,-6041.239,249.1279,0,0,1,0,100,0),
+(@PATH,5,306.4679,-6010.077,240.8223,0,0,1,0,100,0),
+(@PATH,6,305.4742,-6011.148,217.1557,0,0,1,0,100,0),
+(@PATH,7,308.0244,-6019.713,217.1557,0,0,1,0,100,0),
+(@PATH,8,331.7084,-6052.974,217.1557,0,0,1,0,100,0),
+(@PATH,9,350.9348,-6071.563,217.1557,0,0,1,0,100,0),
+(@PATH,10,371.7133,-6102.678,217.1557,0,0,1,0,100,0),
+(@PATH,11,389.949,-6113.926,217.1557,0,0,1,0,100,0);
\ No newline at end of file

From 810fc947c45eef740f9223d2d98a1aa6696bc41c Mon Sep 17 00:00:00 2001
From: DantestyleXD <Null-fox@hotmail.it>
Date: Tue, 23 Aug 2016 23:34:45 +0200
Subject: [PATCH 02/21] [DB/Quest] There Exists No Honor Among Birds rev.1

---
 data/sql/updates/world/2016_08_23_00.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/sql/updates/world/2016_08_23_00.sql b/data/sql/updates/world/2016_08_23_00.sql
index e60b2a8c2..dd5de7a88 100644
--- a/data/sql/updates/world/2016_08_23_00.sql
+++ b/data/sql/updates/world/2016_08_23_00.sql
@@ -1,5 +1,5 @@
 
-ALTER TABLE world_db_version CHANGE COLUMN 2016_08_19_01 2016_08_23_00;
+ALTER TABLE world_db_version CHANGE COLUMN 2016_08_21_00 2016_08_23_00;
 
 /*
 Issue: #89 (https://github.com/AzerothShard/AzerothShard-Issues-ita/issues/89)

From 3eda856b6530700952eb427d3f6f2a4ec2e1d47c Mon Sep 17 00:00:00 2001
From: DantestyleXD <Null-fox@hotmail.it>
Date: Tue, 23 Aug 2016 23:37:03 +0200
Subject: [PATCH 03/21] [DB/Quest] There Exists No Honor Among Birds rev.2

---
 data/sql/updates/world/2016_08_23_00.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/sql/updates/world/2016_08_23_00.sql b/data/sql/updates/world/2016_08_23_00.sql
index dd5de7a88..93339beca 100644
--- a/data/sql/updates/world/2016_08_23_00.sql
+++ b/data/sql/updates/world/2016_08_23_00.sql
@@ -1,5 +1,5 @@
 
-ALTER TABLE world_db_version CHANGE COLUMN 2016_08_21_00 2016_08_23_00;
+ALTER TABLE world_db_version CHANGE COLUMN 2016_08_21_00 2016_08_23_00 BIT;
 
 /*
 Issue: #89 (https://github.com/AzerothShard/AzerothShard-Issues-ita/issues/89)

From a8dd1b129e66e450960e40c8eb45170411d4feb6 Mon Sep 17 00:00:00 2001
From: DantestyleXD <Null-fox@hotmail.it>
Date: Sat, 27 Aug 2016 02:53:03 +0200
Subject: [PATCH 04/21] [DB/Quest] There Exists No Honor Among Birds rev. 3

---
 data/sql/{updates/world => DB - FIX}/2016_08_23_00.sql | 2 --
 1 file changed, 2 deletions(-)
 rename data/sql/{updates/world => DB - FIX}/2016_08_23_00.sql (99%)

diff --git a/data/sql/updates/world/2016_08_23_00.sql b/data/sql/DB - FIX/2016_08_23_00.sql
similarity index 99%
rename from data/sql/updates/world/2016_08_23_00.sql
rename to data/sql/DB - FIX/2016_08_23_00.sql
index 93339beca..e0ffc7792 100644
--- a/data/sql/updates/world/2016_08_23_00.sql
+++ b/data/sql/DB - FIX/2016_08_23_00.sql	
@@ -1,6 +1,4 @@
 
-ALTER TABLE world_db_version CHANGE COLUMN 2016_08_21_00 2016_08_23_00 BIT;
-
 /*
 Issue: #89 (https://github.com/AzerothShard/AzerothShard-Issues-ita/issues/89)
 Missing auras and flags on main NPCs and waypoints for enemy NPCs

From c241fd8f9f9a9b515a97eb0046e97f6c277c94d6 Mon Sep 17 00:00:00 2001
From: DantestyleXD <Null-fox@hotmail.it>
Date: Sat, 27 Aug 2016 21:59:28 +0200
Subject: [PATCH 05/21] typo

---
 data/sql/{DB - FIX => dbfix}/2016_08_23_00.sql | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename data/sql/{DB - FIX => dbfix}/2016_08_23_00.sql (100%)

diff --git a/data/sql/DB - FIX/2016_08_23_00.sql b/data/sql/dbfix/2016_08_23_00.sql
similarity index 100%
rename from data/sql/DB - FIX/2016_08_23_00.sql
rename to data/sql/dbfix/2016_08_23_00.sql

From a56d46adf647dc32492ebef36328ca6a06a45bb3 Mon Sep 17 00:00:00 2001
From: DantestyleXD <Null-fox@hotmail.it>
Date: Mon, 29 Aug 2016 09:51:19 +0200
Subject: [PATCH 06/21] [DB/Quest] There Exists No Honor Among Birds rev. 4

---
 data/sql/{dbfix => updates/pending_db_world}/2016_08_23_00.sql | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename data/sql/{dbfix => updates/pending_db_world}/2016_08_23_00.sql (100%)

diff --git a/data/sql/dbfix/2016_08_23_00.sql b/data/sql/updates/pending_db_world/2016_08_23_00.sql
similarity index 100%
rename from data/sql/dbfix/2016_08_23_00.sql
rename to data/sql/updates/pending_db_world/2016_08_23_00.sql

From 314ad9091b8688ae6b30ebdf4ddbc81d1099b3e4 Mon Sep 17 00:00:00 2001
From: Helias <stefanoborzi32@gmail.com>
Date: Sat, 3 Sep 2016 13:41:56 +0200
Subject: [PATCH 07/21] Core/Build: fixed 4 warnings

---
 src/authserver/Main.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/authserver/Main.cpp b/src/authserver/Main.cpp
index e52771f44..8594f301e 100644
--- a/src/authserver/Main.cpp
+++ b/src/authserver/Main.cpp
@@ -242,21 +242,21 @@ extern int main(int argc, char** argv)
                 CPU_SET(i, &mask);
 
         if (sched_setaffinity(0, sizeof(mask), &mask))
-            sLog->outError("server.authserver", "Can't set used processors (hex): %x, error: %s", affinity, strerror(errno));
+            sLog->outError("Can't set used processors (hex): %x, error: %s", affinity, strerror(errno));
         else
         {
             CPU_ZERO(&mask);
             sched_getaffinity(0, sizeof(mask), &mask);
-            sLog->outString("server.authserver", "Using processors (bitmask, hex): %lx", *(__cpu_mask*)(&mask));
+            sLog->outString("Using processors (bitmask, hex): %lx", *(__cpu_mask*)(&mask));
         }
     }
 
     if (highPriority)
     {
         if (setpriority(PRIO_PROCESS, 0, PROCESS_HIGH_PRIORITY))
-            sLog->outError("server.authserver", "Can't set authserver process priority class, error: %s", strerror(errno));
+            sLog->outError("Can't set authserver process priority class, error: %s", strerror(errno));
         else
-            sLog->outString("server.authserver", "authserver process priority class set to %i", getpriority(PRIO_PROCESS, 0));
+            sLog->outString("authserver process priority class set to %i", getpriority(PRIO_PROCESS, 0));
     }
     
 #endif

From 942f914fd232f5e6f886150f993abb0ff0445347 Mon Sep 17 00:00:00 2001
From: DantestyleXD <Null-fox@hotmail.it>
Date: Sun, 4 Sep 2016 06:04:34 +0200
Subject: [PATCH 08/21] [DB/Quest] There Exists No Honor Among Birds rev.5

---
 data/sql/updates/pending_db_world/2016_08_23_00.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/sql/updates/pending_db_world/2016_08_23_00.sql b/data/sql/updates/pending_db_world/2016_08_23_00.sql
index e0ffc7792..6be8ddcb6 100644
--- a/data/sql/updates/pending_db_world/2016_08_23_00.sql
+++ b/data/sql/updates/pending_db_world/2016_08_23_00.sql
@@ -9,7 +9,7 @@ INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `b
 (24783, 0, 0, 0, 1, 0, 43775);
 
 -- Fjord Hawk Matriarch
-UPDATE `creature_template` SET `InhabitType`='5' WHERE  `entry`=24787;
+UPDATE `creature_template` SET `InhabitType`='5', unit_flags='256' WHERE  `entry`=24787;
 -- Pathing for Entry: 24787 'TDB FORMAT' 
 SET @NPC := 115835;
 SET @PATH := @NPC * 10;

From e1884fd3c4c40944d118f885257282772ec50e2b Mon Sep 17 00:00:00 2001
From: Krath <wmatty_96@live.it>
Date: Mon, 5 Sep 2016 20:27:02 +0200
Subject: [PATCH 09/21] Checking if the player is mounted.

---
 .../trial_of_the_champion.cpp                  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
index ec96dc603..90e861ca2 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
@@ -31,10 +31,20 @@ public:
         switch( pInstance->GetData(DATA_INSTANCE_PROGRESS) )
         {
             case INSTANCE_PROGRESS_INITIAL:
-                gossipTextId = 14688;
-                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1a, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1338);
-                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1b, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1341);
-                break;
+                if(!pPlayer->GetVehicle() )
+				{
+					if (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE)
+						gossipTextId = 15043; //Horde text
+					else
+						gossipTextId = 14757; //Alliance text
+				}
+				else
+				{
+					gossipTextId = 14688;
+					pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1a, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1338);
+					pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1b, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1341);	
+				}
+				break;
             case INSTANCE_PROGRESS_CHAMPIONS_DEAD:
                 gossipTextId = 14737;
                 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1339);

From beb2ca59a51f0ad46bb747e70c3042ab44158f1a Mon Sep 17 00:00:00 2001
From: talamortis <littlelee_1991@live.co.uk>
Date: Mon, 5 Sep 2016 23:48:39 +0100
Subject: [PATCH 10/21] Core/Scripts Pit of Saron

Alliance Players will not londer see double ELANDRA as they enter the dungeon
---
 src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
index 9239906a7..0180e2701 100644
--- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
+++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
@@ -175,8 +175,8 @@ const ChampionPosition introPositions[] =
     { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE }, { 442.526f, 199.361f, 528.84f, 0.0f } },
     { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE }, { 442.843f, 203.193f, 528.84f, 0.0f } },
 
-    { { NPC_LORALEN, NPC_LORALEN }, { 438.505f, 211.54f, 528.71f, 0.0f } },
-    { { NPC_LORALEN, NPC_KALIRA }, { 438.946f, 215.427f, 528.71f, 0.0f } },
+    { { NPC_LORALEN, NPC_KALIRA }, { 438.505f, 211.54f, 528.71f, 0.0f } },
+    { { NPC_KALIRA, NPC_LORALEN }, { 438.946f, 215.427f, 528.71f, 0.0f } },
 
     { { 0, 0 }, { 0.0f, 0.0f, 0.0f, 0.0f } }
 };

From 44c6ef61aa40223b1c25d393c55f1870a347eff3 Mon Sep 17 00:00:00 2001
From: talamortis <littlelee_1991@live.co.uk>
Date: Mon, 5 Sep 2016 23:55:47 +0100
Subject: [PATCH 11/21] Core/Scripts: Halls of Reflection

Alliance will now see the correct npc to pick up the quest  "Wrath of the lich king"
---
 .../HallsOfReflection/instance_halls_of_reflection.cpp          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index 0d46ada33..f16be1443 100644
--- a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -241,7 +241,7 @@ public:
                     creature->SetVisible(false);
                     NPC_GuardGUID = creature->GetGUID();
                     if (TeamIdInInstance == TEAM_ALLIANCE)
-                        creature->UpdateEntry(NPC_ARCHMAGE_ELANDRA);
+                        creature->UpdateEntry(NPC_ARCHMAGE_KORELN);
                     break;
                 case NPC_UTHER:
                     creature->SetVisible(false);

From 9f8d930af71b0bc1b437c4259ea8e613eaf754e6 Mon Sep 17 00:00:00 2001
From: talamortis <littlelee_1991@live.co.uk>
Date: Mon, 5 Sep 2016 23:58:06 +0100
Subject: [PATCH 12/21] Core/Scripts Halls of Reflection

ID of the guards changed so alliance can see the correct NPC
---
 .../FrozenHalls/HallsOfReflection/halls_of_reflection.h         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
index 2cf78d335..6504f7e2b 100644
--- a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
+++ b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
@@ -41,7 +41,7 @@ enum Creatures
     NPC_SYLVANAS_PART2                            = 37554,
 
     NPC_DARK_RANGER_LORALEN                       = 37779,
-    NPC_ARCHMAGE_ELANDRA                          = 37774,
+    NPC_ARCHMAGE_KORELN                           = 37582,
 
     NPC_WAVE_MERCENARY                            = 38177,
     NPC_WAVE_FOOTMAN                              = 38173,

From b35b950bbb1b5d22bf963ea788aba244e859694e Mon Sep 17 00:00:00 2001
From: talamortis <littlelee_1991@live.co.uk>
Date: Tue, 6 Sep 2016 08:01:14 +0100
Subject: [PATCH 13/21] Instance: Pit of Saron Tyrannus Mount Fix

Tyrannus will now be mounted as you enter the instance and you will not just see Rimefang
---
 .../pending_db_world/rev_1473110802988536500.sql   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1473110802988536500.sql

diff --git a/data/sql/updates/pending_db_world/rev_1473110802988536500.sql b/data/sql/updates/pending_db_world/rev_1473110802988536500.sql
new file mode 100644
index 000000000..ce61ce4ee
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1473110802988536500.sql
@@ -0,0 +1,14 @@
+INSERT INTO version_db_world(`sql_rev`) VALUES ('1473110802988536500');
+
+
+/* Tyrannus Mount fix */
+
+DELETE from creature_template where `entry` = 36794;
+DELETE from creature_template_addon where entry = 36794;
+
+INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `modelid1`, `modelid2`, `modelid3`, `modelid4`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `scale`, `rank`, `mindmg`, `maxdmg`, `dmgschool`, `attackpower`, `dmg_multiplier`, `baseattacktime`, `rangeattacktime`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `minrangedmg`, `maxrangedmg`, `rangedattackpower`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `resistance1`, `resistance2`, `resistance3`, `resistance4`, `resistance5`, `resistance6`, `spell1`, `spell2`, `spell3`, `spell4`, `spell5`, `spell6`, `spell7`, `spell8`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `InhabitType`, `HoverHeight`, `Health_mod`, `Mana_mod`, `Armor_mod`, `RacialLeader`, `questItem1`, `questItem2`, `questItem3`, `questItem4`, `questItem5`, `questItem6`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) 
+VALUES (36794, 0, 0, 0, 0, 0, 30277, 0, 0, 0, 'Scourgelord Tyrannus', '', '', 0, 82, 82, 2, 21, 0, 3, 3, 0.5, 1, 463, 640, 0, 726, 7.5, 2000, 0, 2, 832, 2048, 8, 0, 0, 0, 0, 0, 360, 520, 91, 6, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 551, 0, 0, '', 0, 4, 1, 8, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 8388624, 0, 'npc_pos_tyrannus_events', 12340);
+
+
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(36794, 0, 27982, 50331648, 1, 0, '');
\ No newline at end of file

From 27030bdfa4557c22c0aa0cc3a5d975042276bf63 Mon Sep 17 00:00:00 2001
From: talamortis <littlelee_1991@live.co.uk>
Date: Tue, 6 Sep 2016 16:19:09 +0100
Subject: [PATCH 14/21] Silvermoon City: Ambassitor Kelmer Walk fix

Ambassitor Kelmar will now walk around silvermoon city
---
 .../rev_1473111010225487800.sql               | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1473111010225487800.sql

diff --git a/data/sql/updates/pending_db_world/rev_1473111010225487800.sql b/data/sql/updates/pending_db_world/rev_1473111010225487800.sql
new file mode 100644
index 000000000..a36f32e8d
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1473111010225487800.sql
@@ -0,0 +1,130 @@
+INSERT INTO version_db_world(`sql_rev`) VALUES ('1473111010225487800');
+
+
+// Ambassitor Kelmer Walk fix
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=64973;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES
+(64973, 64973, 0, 0, 2),
+(64973, 64969, 3, 90, 2),
+(64973, 64972, 3, 190, 2),
+(64973, 64970, 3, 150, 2),
+(64973, 64971, 3, 230, 2);
+
+-- Pathing for Ambassador Kelemar Entry: 18191 'TDB FORMAT' 
+SET @NPC := 64973;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=9820.037,`position_y`=-7272.192,`position_z`=26.49395 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,9796.135,-7283.987,27.08482,0,0,0,0,100,0), -- 19:26:00
+(@PATH,2,9780.896,-7294.989,25.69673,0,0,0,0,100,0), -- 19:26:06
+(@PATH,3,9761.531,-7308.111,24.53886,0,0,0,0,100,0), -- 19:26:17
+(@PATH,4,9739.729,-7318.02,24.66139,0,0,0,0,100,0), -- 19:26:24
+(@PATH,5,9718.599,-7323.634,17.83319,0,0,0,0,100,0), -- 19:26:33
+(@PATH,6,9705.037,-7327.564,12.23571,0,0,0,0,100,0), -- 19:26:43
+(@PATH,7,9692.664,-7328.254,12.46708,0,0,0,0,100,0), -- 19:26:50
+(@PATH,8,9688.664,-7326.754,13.46708,0,0,0,0,100,0), -- 19:26:50
+(@PATH,9,9687.164,-7326.254,13.71708,0,0,0,0,100,0), -- 19:26:50
+(@PATH,10,9684.914,-7325.504,13.71708,0,0,0,0,100,0), -- 19:26:50
+(@PATH,11,9680.164,-7323.754,13.96708,0,0,0,0,100,0), -- 19:26:50
+(@PATH,12,9678.275,-7317.159,14.09098,0,0,0,0,100,0), -- 19:27:18
+(@PATH,13,9678.275,-7315.409,14.09098,0,0,0,0,100,0), -- 19:27:18
+(@PATH,14,9693.328,-7309.638,14.26884,0,0,0,0,100,0), -- 19:27:24
+(@PATH,15,9694.828,-7309.638,14.51884,0,0,0,0,100,0), -- 19:27:24
+(@PATH,16,9697.677,-7306.808,14.97078,0,0,0,0,100,0), -- 19:27:31
+(@PATH,17,9698.177,-7303.808,15.47078,0,0,0,0,100,0), -- 19:27:31
+(@PATH,18,9694.492,-7299.811,14.81144,0,0,0,0,100,0), -- 19:27:35
+(@PATH,19,9693.242,-7299.561,14.56144,0,0,0,0,100,0), -- 19:27:35
+(@PATH,20,9681.492,-7297.311,14.31144,0,0,0,0,100,0), -- 19:27:35
+(@PATH,21,9680.242,-7297.061,14.31144,0,0,0,0,100,0), -- 19:27:35
+(@PATH,22,9676.988,-7291.817,14.21627,0,0,0,0,100,0), -- 19:27:43
+(@PATH,23,9676.488,-7290.067,13.96627,0,0,0,0,100,0), -- 19:27:43
+(@PATH,24,9674.988,-7285.067,14.21627,0,0,0,0,100,0), -- 19:27:43
+(@PATH,25,9664.734,-7275.52,14.00172,0,0,0,0,100,0), -- 19:27:51
+(@PATH,26,9663.512,-7275.039,14.20501,0,0,0,0,100,0), -- 19:27:54
+(@PATH,27,9640.073,-7275.812,14.19427,0,0,0,0,100,0), -- 19:28:00
+(@PATH,28,9600.183,-7275.951,14.198,0,0,0,0,100,0), -- 19:28:11
+(@PATH,29,9591.281,-7275.895,14.20201,0,0,0,0,100,0), -- 19:28:24
+(@PATH,30,9527.367,-7276.398,14.20272,0,0,0,0,100,0), -- 19:28:42
+(@PATH,31,9514.253,-7280.672,14.23572,0,0,0,0,100,0), -- 19:28:51
+(@PATH,32,9513.003,-7281.172,14.23572,0,0,0,0,100,0), -- 19:28:51
+(@PATH,33,9505.664,-7290.029,14.31716,0,0,0,0,100,0), -- 19:28:59
+(@PATH,34,9505.664,-7307.279,14.31716,0,0,0,0,100,0), -- 19:28:59
+(@PATH,35,9515.084,-7323.17,14.36923,0,0,0,0,100,0), -- 19:29:11
+(@PATH,36,9520.657,-7327.142,14.34109,0,0,0,0,100,0), -- 19:29:18
+(@PATH,37,9530.853,-7327.042,14.0993,0,0,0,0,100,0), -- 19:29:25
+(@PATH,38,9548.444,-7326.636,14.06214,0,0,0,0,100,0), -- 19:29:58
+(@PATH,39,9580.658,-7327.75,14.35676,0,0,0,0,100,0), -- 19:30:04
+(@PATH,40,9594.123,-7336.496,14.41358,0,0,0,0,100,0), -- 19:30:20
+(@PATH,41,9596.051,-7359.264,13.80623,0,0,0,0,100,0), -- 19:31:00
+(@PATH,42,9596.301,-7361.264,13.80623,0,0,0,0,100,0), -- 19:31:00
+(@PATH,43,9579.046,-7368.445,13.69998,0,0,0,0,100,0), -- 19:31:11
+(@PATH,44,9577.046,-7368.695,13.94998,0,0,0,0,100,0), -- 19:31:11
+(@PATH,45,9574.296,-7368.945,14.19998,0,0,0,0,100,0), -- 19:31:11
+(@PATH,46,9573.438,-7371.7,14.59834,0,0,0,0,100,0), -- 19:31:21
+(@PATH,47,9573.438,-7372.7,14.84834,0,0,0,0,100,0), -- 19:31:21
+(@PATH,48,9573.438,-7377.45,14.84834,0,0,0,0,100,0), -- 19:31:21
+(@PATH,49,9573.438,-7381.45,14.84834,0,0,0,0,100,0), -- 19:31:21
+(@PATH,50,9578.811,-7384.082,14.05795,0,0,0,0,100,0), -- 19:31:27
+(@PATH,51,9581.811,-7384.332,13.80795,0,0,0,0,100,0), -- 19:31:27
+(@PATH,52,9590.561,-7385.082,13.80795,0,0,0,0,100,0), -- 19:31:27
+(@PATH,53,9591.811,-7385.332,13.80795,0,0,0,0,100,0), -- 19:31:27
+(@PATH,54,9594.387,-7393.903,13.32688,0,0,0,0,100,0), -- 19:31:35
+(@PATH,55,9605.18,-7424.402,13.54854,0,0,0,0,100,0), -- 19:31:46
+(@PATH,56,9611.559,-7427.8,13.55342,0,0,0,0,100,0), -- 19:31:55
+(@PATH,57,9650.357,-7430.099,13.54782,0,0,0,0,100,0), -- 19:32:02
+(@PATH,58,9667.592,-7436.145,13.54347,0,0,0,0,100,0), -- 19:32:13
+(@PATH,59,9669.131,-7436.995,13.54329,0,0,0,0,100,0), -- 19:32:19
+(@PATH,60,9692.813,-7437.087,13.54329,0,0,0,0,100,0), -- 19:32:27
+(@PATH,61,9700.063,-7434.087,13.54329,0,0,0,0,100,0), -- 19:32:27
+(@PATH,62,9720.646,-7424.146,13.5211,0,0,0,0,100,0), -- 19:32:35
+(@PATH,63,9746.543,-7421.814,13.48517,0,0,0,0,100,0), -- 19:32:44
+(@PATH,64,9740.969,-7422.06,13.22301,0,0,0,0,100,0), -- 19:32:51
+(@PATH,65,9760.844,-7421.124,13.52046,0,0,0,0,100,0), -- 19:33:13
+(@PATH,66,9766.758,-7413.826,13.86535,0,0,0,0,100,0), -- 19:33:19
+(@PATH,67,9767.258,-7402.326,13.86535,0,0,0,0,100,0), -- 19:33:19
+(@PATH,68,9767.258,-7400.326,13.86535,0,0,0,0,100,0), -- 19:33:19
+(@PATH,69,9767.258,-7397.576,14.11535,0,0,0,0,100,0), -- 19:33:19
+(@PATH,70,9767.447,-7397.039,14.50608,0,0,0,0,100,0), -- 19:33:29
+(@PATH,71,9770.447,-7397.039,14.50608,0,0,0,0,100,0), -- 19:33:29
+(@PATH,72,9775.947,-7396.789,15.00608,0,0,0,0,100,0), -- 19:33:29
+(@PATH,73,9790.197,-7396.289,14.75608,0,0,0,0,100,0), -- 19:33:29
+(@PATH,74,9791.447,-7396.289,15.00608,0,0,0,0,100,0), -- 19:33:29
+(@PATH,75,9793.188,-7398,14.60959,0,0,0,0,100,0), -- 19:33:40
+(@PATH,76,9793.188,-7400.75,14.10959,0,0,0,0,100,0), -- 19:33:40
+(@PATH,77,9793.188,-7402.5,14.10959,0,0,0,0,100,0), -- 19:33:40
+(@PATH,78,9793.438,-7405.5,13.85959,0,0,0,0,100,0), -- 19:33:40
+(@PATH,79,9793.438,-7415,13.85959,0,0,0,0,100,0), -- 19:33:40
+(@PATH,80,9801.363,-7416.336,13.89329,0,0,0,0,100,0), -- 19:33:47
+(@PATH,81,9803.363,-7416.336,13.39329,0,0,0,0,100,0), -- 19:33:47
+(@PATH,82,9815.096,-7417.077,13.5569,0,0,0,0,100,0), -- 19:33:55
+(@PATH,83,9842.76,-7416.906,13.55959,0,0,0,0,100,0), -- 19:34:05
+(@PATH,84,9876.417,-7415.617,13.53772,0,0,0,0,100,0), -- 19:34:14
+(@PATH,85,9872.041,-7415.873,13.27497,0,0,0,0,100,0), -- 19:34:20
+(@PATH,86,9879.891,-7412.866,13.51642,0,0,0,0,100,0), -- 19:35:01
+(@PATH,87,9882.891,-7409.116,13.51642,0,0,0,0,100,0), -- 19:35:01
+(@PATH,88,9884.779,-7404.788,13.42007,0,0,0,0,100,0), -- 19:35:06
+(@PATH,89,9884.512,-7369.616,20.88766,0,0,0,0,100,0), -- 19:35:13
+(@PATH,90,9888.86,-7355.768,20.93519,0,0,0,0,100,0), -- 19:35:22
+(@PATH,91,9889.949,-7346.212,22.30157,0,0,0,0,100,0), -- 19:35:28
+(@PATH,92,9889.699,-7344.462,22.55157,0,0,0,0,100,0), -- 19:35:28
+(@PATH,93,9885.719,-7331.884,24.01373,0,0,0,0,100,0), -- 19:35:35
+(@PATH,94,9875.469,-7325.634,25.51373,0,0,0,0,100,0), -- 19:35:35
+(@PATH,95,9873.414,-7324.011,26.02122,0,0,0,0,100,0), -- 19:35:42
+(@PATH,96,9870.914,-7322.011,26.52122,0,0,0,0,100,0), -- 19:35:42
+(@PATH,97,9862.414,-7315.011,26.52122,0,0,0,0,100,0), -- 19:35:42
+(@PATH,98,9858.664,-7312.011,26.52122,0,0,0,0,100,0), -- 19:35:42
+(@PATH,99,9852.256,-7303.121,26.45031,0,0,0,0,100,0), -- 19:36:15
+(@PATH,100,9850.756,-7299.871,26.45031,0,0,0,0,100,0), -- 19:36:15
+(@PATH,101,9848.256,-7295.121,26.45031,0,0,0,0,100,0), -- 19:36:15
+(@PATH,102,9845.628,-7286.911,26.397,0,0,0,0,100,0), -- 19:36:22
+(@PATH,103,9843.291,-7277.301,26.41252,0,0,0,0,100,0), -- 19:36:28
+(@PATH,104,9819.617,-7272.363,26.49641,0,0,0,0,100,0); -- 19:36:36
+
+UPDATE `creature` SET `spawndist`=0,`position_x`=9817.200195,`position_y`=-7268.220215,`position_z`=26.223801 WHERE `guid`=64969;
+UPDATE `creature` SET `spawndist`=0,`position_x`=9824.250000,`position_y`=-7272.975586,`position_z`=26.244701 WHERE `guid`=64970;
+UPDATE `creature` SET `spawndist`=0,`position_x`=9824.455078,`position_y`=-7270.105957,`position_z`=26.228758 WHERE `guid`=64972;
+UPDATE `creature` SET `spawndist`=0,`position_x`=9822.427734,`position_y`=-7267.509277,`position_z`=26.203625 WHERE `guid`=64971;

From 36a0f1f3381e33aee5bbe8eac092f020396640ec Mon Sep 17 00:00:00 2001
From: talamortis <littlelee_1991@live.co.uk>
Date: Tue, 6 Sep 2016 16:20:28 +0100
Subject: [PATCH 15/21] Instance: Culling of stratholme - Arthus Fix

Arthus will no longer attack start NPC and stop at the correct place in firestreet
---
 .../rev_1473111186171042200.sql               | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1473111186171042200.sql

diff --git a/data/sql/updates/pending_db_world/rev_1473111186171042200.sql b/data/sql/updates/pending_db_world/rev_1473111186171042200.sql
new file mode 100644
index 000000000..9c403922c
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1473111186171042200.sql
@@ -0,0 +1,87 @@
+INSERT INTO version_db_world(`sql_rev`) VALUES ('1473111186171042200');
+
+// Culling of Stratholme Fix
+// Fix Arthus start senario & Resting point fix
+
+
+ALTER TABLE world_db_version CHANGE COLUMN 2016_08_14_00 2016_08_14_01 bit;
+
+DELETE FROM `creature_template` WHERE `entry` IN (11082,14646,28167,28169,28340,28341,28409,28439,28509,28656,29865,29866,29868,30996,31006,31126,31127);
+INSERT INTO `creature_template` VALUES
+(11082, 0, 0, 0, 0, 0, 10547, 0, 0, 0, 'Stratholme Courier', NULL, NULL, 0, 57, 57, 0, 21, 0, 1, 1.14286, 1, 1, 98, 130, 0, 238, 3.5, 2000, 1301, 1, 32832, 2048, 0, 0, 0, 0, 0, 0, 68, 99, 24, 6, 0, 11082, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 604, 794, 'SmartAI', 1, 3, 1, 4.5, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 8388624, 0, '', 12340),
+(14646, 0, 0, 0, 0, 0, 11686, 0, 0, 0, 'Stratholme Trigger', NULL, NULL, 0, 1, 1, 0, 114, 0, 1, 1.14286, 1, 0, 2, 2, 0, 24, 3.5, 2000, 2200, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 1, 100, 10, 0, 0, 0, 100008, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'NullCreatureAI', 0, 4, 1, 1.35, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 128, '', 12340),
+(28167, 0, 0, 0, 0, 0, 25168, 25169, 25311, 25312, 'Stratholme Citizen', '', '', 0, 77, 79, 0, 190, 0, 1, 1.14286, 1, 0, 404, 564, 0, 582, 1, 2000, 0, 1, 256, 2048, 8, 0, 0, 0, 0, 0, 334, 494, 95, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 0.3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 96, 1, 0, 0, 'npc_cos_stratholme_citizien', 12340),
+(28169, 0, 0, 0, 0, 0, 25171, 25172, 25313, 25314, 'Stratholme Resident', '', '', 0, 78, 79, 0, 190, 0, 1, 1.14286, 1, 0, 404, 564, 0, 582, 1, 2000, 0, 1, 256, 2048, 8, 0, 0, 0, 0, 0, 334, 494, 95, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 0.3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 96, 1, 0, 0, 'npc_cos_stratholme_citizien', 12340),
+(28340, 0, 0, 0, 0, 0, 25168, 25169, 0, 0, 'Stratholme Citizen', '', '', 0, 80, 80, 2, 190, 0, 1, 1.14286, 1, 0, 422, 586, 0, 642, 1, 2000, 2000, 1, 768, 2048, 0, 0, 0, 0, 0, 0, 345, 509, 103, 7, 0, 28340, 0, 70210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'SmartAI', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, '', 12340),
+(28341, 0, 0, 0, 0, 0, 25313, 25314, 0, 0, 'Stratholme Resident', '', '', 0, 80, 80, 2, 190, 0, 1, 1.14286, 1, 0, 417, 582, 0, 608, 1, 2000, 2000, 1, 768, 2048, 0, 0, 0, 0, 0, 0, 341, 506, 80, 7, 0, 28341, 0, 70210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'SmartAI', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, '', 12340),
+(28409, 0, 0, 0, 0, 0, 25392, 0, 0, 0, 'Time Rift (CoT Stratholme)', '', '', 0, 70, 70, 2, 35, 0, 1, 0.992063, 1, 0, 252, 357, 0, 304, 1, 2000, 2000, 1, 33554688, 2048, 0, 0, 0, 0, 0, 0, 215, 320, 44, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, '', 12340),
+(28439, 0, 0, 0, 0, 0, 25441, 0, 0, 0, 'Time Rift (CoT Stratholme, Large)', '', '', 0, 70, 70, 2, 35, 0, 1, 0.992063, 1, 0, 252, 357, 0, 304, 1, 2000, 2000, 1, 33554688, 2048, 0, 0, 0, 0, 0, 0, 215, 320, 44, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, '', 12340),
+(28509, 0, 0, 0, 0, 0, 1126, 24719, 0, 0, 'Building (CoT Stratholme)', '', '', 0, 80, 80, 2, 1814, 0, 1, 1.14286, 1, 0, 2, 2, 0, 24, 1, 2000, 2000, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 1, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 128, '', 12340),
+(28656, 0, 0, 0, 0, 0, 24868, 0, 0, 0, 'Hourglass (CoT Stratholme)', '', '', 0, 80, 80, 2, 35, 0, 1, 1, 1, 0, 422, 586, 0, 642, 1, 2000, 2000, 1, 33555200, 2048, 0, 0, 0, 0, 0, 0, 345, 509, 103, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, '', 12340),
+(29865, 0, 0, 0, 0, 0, 26598, 26599, 26600, 26601, 'Stratholme Citizen Specimen', '', '', 0, 78, 79, 2, 190, 0, 1, 0.78571, 1, 0, 404, 564, 0, 582, 1, 2000, 2000, 1, 33555200, 2048, 0, 0, 0, 0, 0, 0, 334, 494, 95, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 0.3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 96, 1, 0, 0, '', 12340),
+(29866, 0, 0, 0, 0, 0, 26602, 26603, 26604, 26605, 'Stratholme Resident Specimen', '', '', 0, 78, 79, 2, 190, 0, 1, 0.78571, 1, 0, 404, 564, 0, 582, 1, 2000, 2000, 1, 33555200, 2048, 0, 0, 0, 0, 0, 0, 334, 494, 95, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 0.3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 96, 1, 0, 0, '', 12340),
+(29868, 0, 0, 0, 0, 0, 262, 338, 344, 11873, 'Stratholme Child Specimen', '', '', 0, 78, 79, 2, 190, 0, 1, 0.78571, 1, 0, 404, 564, 0, 582, 1, 2000, 2000, 1, 33555200, 2048, 0, 0, 0, 0, 0, 0, 334, 494, 95, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 0.3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 96, 1, 0, 0, '', 12340),
+(30996, 0, 0, 0, 0, 0, 16480, 19595, 0, 0, 'CoT Stratholme - Crates KC Bunny', '', '', 0, 60, 60, 1, 35, 0, 1, 1.14286, 1, 0, 2, 2, 0, 24, 1, 2000, 2000, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 1, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 4, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 128, '', 12340),
+(31006, 0, 0, 0, 0, 0, 16480, 19595, 0, 0, 'CoT Stratholme - Mal\'Ganis KC Bunny', '', '', 0, 60, 60, 1, 35, 0, 1, 1.14286, 1, 0, 2, 2, 0, 24, 1, 2000, 2000, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 1, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 128, '', 12340),
+(31126, 0, 0, 0, 0, 0, 25168, 25169, 0, 0, 'Agitated Stratholme Citizen', '', '', 0, 80, 80, 2, 190, 0, 1, 1.14286, 1, 0, 422, 586, 0, 642, 1, 2000, 0, 1, 256, 2048, 8, 0, 0, 0, 0, 0, 345, 509, 103, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 'npc_cos_stratholme_citizien', 12340),
+(31127, 0, 0, 0, 0, 0, 25313, 25314, 0, 0, 'Agitated Stratholme Resident', '', '', 0, 80, 80, 2, 190, 0, 1, 1.14286, 1, 0, 422, 586, 0, 642, 1, 2000, 0, 1, 256, 2048, 8, 0, 0, 0, 0, 0, 345, 509, 103, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 'npc_cos_stratholme_citizien', 12340);
+
+DELETE FROM `script_waypoint` WHERE `entry` = 26499;
+INSERT INTO `script_waypoint` VALUES
+(26499, 0, 1903.17, 1291.57, 143.32, 0, 'culling Bridge WP1'),
+(26499, 1, 1911.09, 1314.26, 150.026, 0, 'culling Bridge WP2'),
+(26499, 2, 1902.96, 1295.13, 143.388, 0, 'culling Bridge WP3'),
+(26499, 3, 1913.73, 1287.41, 141.927, 10000, 'culling Bridge WP4'),
+(26499, 4, 1990.83, 1293.39, 145.467, 0, 'culling Bridge WP5'),
+(26499, 5, 1997, 1317.78, 142.963, 0, 'culling Bridge WP6'),
+(26499, 6, 2019.63, 1326.08, 142.929, 0, 'culling Bridge WP7'),
+(26499, 7, 2026.47, 1287.09, 143.596, 0, 'culling Bridge WP8'),
+(26499, 8, 2050.66, 1287.33, 142.671, 0, 'culling Bridge WP9'),
+(26499, 9, 2081.45, 1287.77, 141.324, 0, 'culling Streets WP1'),
+(26499, 10, 2087.69, 1280.34, 140.73, 1000, 'culling Streets WP2'),
+(26499, 11, 2092.15, 1276.65, 140.52, 0, 'culling Streets WP3'),
+(26499, 12, 2099.88, 1280.21, 138.55, 0, 'culling Streets WP4'),
+(26499, 13, 2120.76, 1286.97, 136.343, 0, 'culling Streets WP5'),
+(26499, 14, 2165.07, 1279.34, 133.4, 0, 'culling Streets WP6'),
+(26499, 15, 2186.44, 1234.44, 136.524, 0, 'culling Streets WP7'),
+(26499, 16, 2210.39, 1207.55, 136.259, 0, 'culling Streets WP8'),
+(26499, 17, 2243.59, 1177.7, 137.144, 0, 'culling Streets WP9'),
+(26499, 18, 2286.88, 1177.26, 137.631, 0, 'culling Streets WP10'),
+(26499, 19, 2320.37, 1179.95, 133.926, 0, 'culling Streets WP11'),
+(26499, 20, 2365.63, 1194.84, 131.974, 0, 'culling Streets WP12'),
+(26499, 21, 2366.56, 1197.76, 134.382, 0, 'culling House WP1'),
+(26499, 22, 2394.01, 1205.15, 134.125, 0, 'culling House WP2'),
+(26499, 23, 2395.85, 1206.34, 134.039, 0, 'culling House WP3'),
+(26499, 24, 2442.02, 1219.2, 133.999, 0, 'culling House WP3'),
+(26499, 25, 2447.1, 1191.18, 148.076, 0, 'culling House WP4'),
+(26499, 26, 2449.32, 1191.09, 148.076, 0, 'culling House WP5'),
+(26499, 27, 2418.49, 1196.06, 148.076, 0, 'culling House WP6'),
+(26499, 28, 2401.22, 1191.7, 148.076, 0, 'culling House WP7'),
+(26499, 29, 2409.21, 1157.43, 148.19, 0, 'culling House WP8'),
+(26499, 30, 2417.58, 1121.03, 148.082, 0, 'culling House WP9'),
+(26499, 31, 2423.12, 1119.43, 148.076, 0, 'culling House WP10'),
+(26499, 32, 2447.83, 1112.71, 148.076, 0, 'culling House WP11'),
+(26499, 33, 2457.13, 1120.94, 150.008, 0, 'culling House WP12'),
+(26499, 34, 2459.69, 1127.01, 150.008, 0, 'culling House WP13'),
+(26499, 35, 2469.62, 1122.27, 150.008, 0, 'culling House WP14'),
+(26499, 36, 2470.44, 1122.79, 150.008, 3000, 'culling House WP15'),
+(26499, 37, 2471.66, 1123.08, 150.035, 3000, 'culling House WP16'),
+(26499, 38, 2483.18, 1125.04, 149.905, 0, 'culling Secret WP1'),
+(26499, 39, 2487.87, 1099.76, 144.858, 0, 'culling Secret WP2'),
+(26499, 40, 2498.27, 1101.93, 144.599, 0, 'culling Secret WP3'),
+(26499, 41, 2492.11, 1128.24, 139.967, 0, 'culling Secret WP4'),
+(26499, 42, 2500.29, 1130.18, 139.982, 0, 'culling Room WP1'),
+(26499, 43, 2503.01, 1119.24, 139.978, 0, 'culling Room WP2'),
+(26499, 44, 2517.82, 1122.65, 132.066, 0, 'culling Room WP3'),
+(26499, 45, 2540.48, 1129.06, 130.868, 7000, 'culling Fire Street WP1'),
+(26499, 46, 2568.62, 1157.79, 126.906, 0, 'culling Fire Street WP2'),
+(26499, 47, 2556.07, 1222.06, 125.412, 20000, 'culling Fire Street WP3'),
+(26499, 48, 2521.53, 1295.21, 130.573, 0, 'culling Fire Street WP4'),
+(26499, 49, 2504.36, 1348.67, 132.944, 0, 'culling Fire Street WP5'),
+(26499, 50, 2450.59, 1431.54, 131.361, 0, 'culling Fire Street WP6'),
+(26499, 51, 2353.49, 1404.84, 128.531, 0, 'culling Market WP1'),
+(26499, 52, 2329.88, 1406.27, 128.013, 0, 'culling Market WP2'),
+(26499, 53, 2329.88, 1406.27, 128.013, 12000, 'culling Market WP3'),
+(26499, 54, 2327.39, 1412.47, 127.692, 0, 'culling Market WP4'),
+(26499, 55, 2303.02, 1480.07, 128.139, 0, 'culling Crusader WP1'),
+(26499, 56, 2296.67, 1502.36, 128.362, 0, 'culling Crusader WP2');
\ No newline at end of file

From 99646d171edd47102a3565308b13fc867c7e9623 Mon Sep 17 00:00:00 2001
From: talamortis <littlelee_1991@live.co.uk>
Date: Tue, 6 Sep 2016 16:21:52 +0100
Subject: [PATCH 16/21] World/ Winterfin Oracle ID 25216

Winterfin oricle will now cast lightning bolt.
---
 .../rev_1473152344430838100.sql               | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1473152344430838100.sql

diff --git a/data/sql/updates/pending_db_world/rev_1473152344430838100.sql b/data/sql/updates/pending_db_world/rev_1473152344430838100.sql
new file mode 100644
index 000000000..fe273cb57
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1473152344430838100.sql
@@ -0,0 +1,28 @@
+INSERT INTO version_db_world(`sql_rev`) VALUES ('1473152344430838100');
+
+/* 
+I take no credit for this fix im just doing the PR to close the issue.
+Winterfin oricle will now cast lightning bolt.
+the real credit goes to Chrisjiajun, this works
+
+Closes issue #119
+
+ */
+
+DELETE FROM smart_scripts WHERE entryorguid=25216;
+INSERT INTO smart_scripts (entryorguid, source_type, id, link, event_type, event_phase_mask, event_chance, event_flags, event_param1, event_param2, event_param3, event_param4, action_type, action_param1, action_param2, action_param3, action_param4, action_param5, action_param6, target_type, target_param1, target_param2, target_param3, target_x, target_y, target_z, target_o, comment) VALUES
+(25216, 0, 0, 0, 4, 0, 100, 1, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Set Phase 1 on Aggro'),
+(25216, 0, 1, 0, 4, 1, 100, 1, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stop Moving on Aggro'),
+(25216, 0, 2, 0, 4, 1, 100, 1, 0, 0, 0, 0, 11, 9532, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cast bolt on Aggro'),
+(25216, 0, 3, 0, 9, 1, 100, 0, 0, 40, 3400, 4700, 11, 9532, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cast bolt'),
+(25216, 0, 4, 0, 9, 1, 100, 0, 40, 100, 0, 0, 21, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Start Moving when not in bolt Range'),
+(25216, 0, 5, 0, 9, 1, 100, 0, 10, 15, 0, 0, 21, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stop Moving at 15 Yards'),
+(25216, 0, 6, 0, 9, 1, 100, 0, 0, 40, 0, 0, 21, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stop Moving when in bolt Range'),
+(25216, 0, 7, 0, 3, 1, 100, 0, 0, 15, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Set Phase 2 at 15% Mana'),
+(25216, 0, 8, 0, 3, 2, 100, 0, 0, 15, 0, 0, 21, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Start Moving at 15% Mana'),
+(25216, 0, 9, 0, 3, 2, 100, 0, 30, 100, 100, 100, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Set Phase 1 When Mana is above 30%'),
+(25216, 0, 10, 0, 2, 2, 100, 1, 0, 15, 0, 0, 22, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Set Phase 3 at 15% HP'),
+(25216, 0, 11, 0, 2, 3, 100, 1, 0, 15, 0, 0, 25, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Flee at 15% HP'),
+(25216, 0, 12, 0, 7, 3, 100, 1, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Reset on Evade'),
+(25216, 0, 13, 0, 2, 3, 100, 1, 0, 15, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Say Text at 15% HP'),
+(25216, 0, 14, 0, 9, 1, 100, 0, 0, 5, 12300, 19800, 11, 50272, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cast Unstable Magic on Close');
\ No newline at end of file

From 5dcfe074ff3760600c2059d6a11d32b767cbf55a Mon Sep 17 00:00:00 2001
From: talamortis <littlelee_1991@live.co.uk>
Date: Sun, 11 Sep 2016 23:35:12 +0100
Subject: [PATCH 17/21] Ambassador Kelemar Waypoint

Removed the //
---
 data/sql/updates/pending_db_world/rev_1473111010225487800.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/sql/updates/pending_db_world/rev_1473111010225487800.sql b/data/sql/updates/pending_db_world/rev_1473111010225487800.sql
index a36f32e8d..ff740f9c3 100644
--- a/data/sql/updates/pending_db_world/rev_1473111010225487800.sql
+++ b/data/sql/updates/pending_db_world/rev_1473111010225487800.sql
@@ -1,7 +1,7 @@
-INSERT INTO version_db_world(`sql_rev`) VALUES ('1473111010225487800');
+INSERT INTO version_db_world(`sql_rev`) VALUES ('1473111010225487800');
 
 
-// Ambassitor Kelmer Walk fix
+/* Ambassitor Kelmer Walk fix */
 
 DELETE FROM `creature_formations` WHERE `leaderGUID`=64973;
 INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES

From 2875b32a94b29f1735409e045c827b694f6f1b5a Mon Sep 17 00:00:00 2001
From: talamortis <littlelee_1991@live.co.uk>
Date: Mon, 12 Sep 2016 16:43:01 +0100
Subject: [PATCH 18/21] Removed

Updated.
---
 data/sql/updates/pending_db_world/rev_1473111010225487800.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/sql/updates/pending_db_world/rev_1473111010225487800.sql b/data/sql/updates/pending_db_world/rev_1473111010225487800.sql
index ff740f9c3..04fa79817 100644
--- a/data/sql/updates/pending_db_world/rev_1473111010225487800.sql
+++ b/data/sql/updates/pending_db_world/rev_1473111010225487800.sql
@@ -1,7 +1,7 @@
 INSERT INTO version_db_world(`sql_rev`) VALUES ('1473111010225487800');
 
 
-/* Ambassitor Kelmer Walk fix */
+-- Ambassitor Kelmer Walk fix 
 
 DELETE FROM `creature_formations` WHERE `leaderGUID`=64973;
 INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES

From e89ff65d590fc29755f184b73c4796daaaca7487 Mon Sep 17 00:00:00 2001
From: talamortis <littlelee_1991@live.co.uk>
Date: Mon, 12 Sep 2016 16:43:38 +0100
Subject: [PATCH 19/21] Changed comment

---
 .../updates/pending_db_world/rev_1473110802988536500.sql    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/sql/updates/pending_db_world/rev_1473110802988536500.sql b/data/sql/updates/pending_db_world/rev_1473110802988536500.sql
index ce61ce4ee..602c23d71 100644
--- a/data/sql/updates/pending_db_world/rev_1473110802988536500.sql
+++ b/data/sql/updates/pending_db_world/rev_1473110802988536500.sql
@@ -1,7 +1,7 @@
-INSERT INTO version_db_world(`sql_rev`) VALUES ('1473110802988536500');
+INSERT INTO version_db_world(`sql_rev`) VALUES ('1473110802988536500');
 
 
-/* Tyrannus Mount fix */
+-- Tyrannus Mount fix 
 
 DELETE from creature_template where `entry` = 36794;
 DELETE from creature_template_addon where entry = 36794;
@@ -11,4 +11,4 @@ VALUES (36794, 0, 0, 0, 0, 0, 30277, 0, 0, 0, 'Scourgelord Tyrannus', '', '', 0,
 
 
 INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
-(36794, 0, 27982, 50331648, 1, 0, '');
\ No newline at end of file
+(36794, 0, 27982, 50331648, 1, 0, '');

From 438077bc0c27d2022ea97be6ea11d9f64b0917be Mon Sep 17 00:00:00 2001
From: talamortis <littlelee_1991@live.co.uk>
Date: Mon, 12 Sep 2016 16:44:09 +0100
Subject: [PATCH 20/21] Changed comment

---
 .../updates/pending_db_world/rev_1473111186171042200.sql  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/sql/updates/pending_db_world/rev_1473111186171042200.sql b/data/sql/updates/pending_db_world/rev_1473111186171042200.sql
index 9c403922c..5d55bd29e 100644
--- a/data/sql/updates/pending_db_world/rev_1473111186171042200.sql
+++ b/data/sql/updates/pending_db_world/rev_1473111186171042200.sql
@@ -1,7 +1,7 @@
-INSERT INTO version_db_world(`sql_rev`) VALUES ('1473111186171042200');
+INSERT INTO version_db_world(`sql_rev`) VALUES ('1473111186171042200');
 
-// Culling of Stratholme Fix
-// Fix Arthus start senario & Resting point fix
+-- Culling of Stratholme Fix
+-- Fix Arthus start senario & Resting point fix
 
 
 ALTER TABLE world_db_version CHANGE COLUMN 2016_08_14_00 2016_08_14_01 bit;
@@ -84,4 +84,4 @@ INSERT INTO `script_waypoint` VALUES
 (26499, 53, 2329.88, 1406.27, 128.013, 12000, 'culling Market WP3'),
 (26499, 54, 2327.39, 1412.47, 127.692, 0, 'culling Market WP4'),
 (26499, 55, 2303.02, 1480.07, 128.139, 0, 'culling Crusader WP1'),
-(26499, 56, 2296.67, 1502.36, 128.362, 0, 'culling Crusader WP2');
\ No newline at end of file
+(26499, 56, 2296.67, 1502.36, 128.362, 0, 'culling Crusader WP2');

From 3356a712c3e0d8346ab76bca5ccf57406c0b8216 Mon Sep 17 00:00:00 2001
From: talamortis <littlelee_1991@live.co.uk>
Date: Sat, 24 Sep 2016 12:37:08 +0100
Subject: [PATCH 21/21] Black knight orders

Black nights orders griffen will now take you to the correct point instead of dropping you in the ocean
---
 .../rev_1474716815295101300.sql               | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1474716815295101300.sql

diff --git a/data/sql/updates/pending_db_world/rev_1474716815295101300.sql b/data/sql/updates/pending_db_world/rev_1474716815295101300.sql
new file mode 100644
index 000000000..ac74a49bb
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1474716815295101300.sql
@@ -0,0 +1,51 @@
+INSERT INTO version_db_world(`sql_rev`) VALUES ('1474716815295101300');
+
+DELETE FROM waypoints WHERE entry = 33519;
+
+UPDATE smart_scripts SET event_param1=44 WHERE entryorguid=33519 AND source_type=0 AND id=2;
+
+INSERT INTO waypoints (entry, pointid, position_x, position_y, position_z, point_comment) VALUES
+(33519, 1, 8526.23, 567.717, 552.608, 'Black Knight Gryphon WP1'),
+(33519, 2, 8529.65, 561.457, 553.146, 'Black Knight Gryphon WP2'),
+(33519, 3, 8560.83, 564.063, 560.969, 'Black Knight Gryphon WP3'),
+(33519, 4, 8618.12, 597.455, 555.925, 'Black Knight Gryphon WP4'),
+(33519, 5, 8656.04, 624.922, 552.328, 'Black Knight Gryphon WP5'),
+(33519, 6, 8680.42, 660.062, 549.031, 'Black Knight Gryphon WP6'),
+(33519, 7, 8698.54, 705.598, 548.933, 'Black Knight Gryphon WP7'),
+(33519, 8, 8715.51, 748.276, 549.854, 'Black Knight Gryphon WP8'),
+(33519, 9, 8740.09, 810.067, 549.854, 'Black Knight Gryphon WP9'),
+(33519, 10, 8764.67, 871.858, 549.854, 'Black Knight Gryphon WP10'),
+(33519, 11, 8796.18, 959.072, 518.157, 'Black Knight Gryphon WP11'),
+(33519, 12, 8815.05, 1018.42, 468.263, 'Black Knight Gryphon WP12'),
+(33519, 13, 8833.93, 1077.77, 418.369, 'Black Knight Gryphon WP13'),
+(33519, 14, 8843.37, 1107.45, 393.422, 'Black Knight Gryphon WP14'),
+(33519, 15, 8852.8, 1137.12, 368.474, 'Black Knight Gryphon WP15'),
+(33519, 16, 8887.41, 1245.93, 277.002, 'Black Knight Gryphon WP16'),
+(33519, 17, 8899.99, 1285.49, 243.739, 'Black Knight Gryphon WP17'),
+(33519, 18, 8917.19, 1344.25, 206.989, 'Black Knight Gryphon WP18'),
+(33519, 19, 8935.65, 1428.33, 171.939, 'Black Knight Gryphon WP19'),
+(33519, 20, 8952.14, 1502.28, 152.627, 'Black Knight Gryphon WP20'),
+(33519, 21, 8977.58, 1604.01, 134.608, 'Black Knight Gryphon WP21'),
+(33519, 22, 8999.84, 1693.02, 118.842, 'Black Knight Gryphon WP22'),
+(33519, 23, 9009.38, 1731.17, 112.085, 'Black Knight Gryphon WP23'),
+(33519, 24, 9016.45, 1757.73, 107.355, 'Black Knight Gryphon WP24'),
+(33519, 25, 9042.43, 1803.28, 98.3457, 'Black Knight Gryphon WP25'),
+(33519, 26, 9068.41, 1848.82, 89.3364, 'Black Knight Gryphon WP26'),
+(33519, 27, 9095.58, 1894.97, 73.9581, 'Black Knight Gryphon WP27'),
+(33519, 28, 9113.08, 1951.09, 61.4356, 'Black Knight Gryphon WP28'),
+(33519, 29, 9120.62, 1988.22, 68.3712, 'Black Knight Gryphon WP29'),
+(33519, 30, 9126.46, 2030.88, 76.7076, 'Black Knight Gryphon WP30'),
+(33519, 31, 9125.28, 2059.72, 71.875, 'Black Knight Gryphon WP31'),
+(33519, 32, 9123.38, 2100.16, 76.8306, 'Black Knight Gryphon WP32'),
+(33519, 33, 9121.33, 2132.18, 70.2638, 'Black Knight Gryphon WP33'),
+(33519, 34, 9095.69, 2181.88, 58.6374, 'Black Knight Gryphon WP34'),
+(33519, 35, 9076.85, 2189.14, 54.3544, 'Black Knight Gryphon WP35'),
+(33519, 36, 9036.74, 2180.53, 57.0958, 'Black Knight Gryphon WP36'),
+(33519, 37, 9031.46, 2161.92, 58.3603, 'Black Knight Gryphon WP37'),
+(33519, 38, 9043.38, 2134.61, 60.2847, 'Black Knight Gryphon WP38'),
+(33519, 39, 9058.39, 2101.61, 62.2349, 'Black Knight Gryphon WP39'),
+(33519, 40, 9061.58, 2094.73, 64.1907, 'Black Knight Gryphon WP40'),
+(33519, 41, 9061.58, 2094.73, 64.1907, 'Black Knight Gryphon WP41'),
+(33519, 42, 9066.5, 2084.15, 66.2016, 'Black Knight Gryphon WP42'),
+(33519, 43, 9068.36, 2080.14, 66.9176, 'Black Knight Gryphon WP43'),
+(33519, 44, 9069.15, 2078.45, 66.99, 'Black Knight Gryphon WP44');