17 files changed, 205 insertions, 4 deletions
diff --git a/sql/updates/world/2015_12_29_00_world.sql b/sql/updates/world/2015_12_29_00_world.sql
new file mode 100644
index 00000000000..da6de123190
--- /dev/null
+++ b/sql/updates/world/2015_12_29_00_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `creature` SET `modelid`=0 WHERE `id`=33787;
diff --git a/sql/updates/world/2015_12_29_01_world.sql b/sql/updates/world/2015_12_29_01_world.sql
new file mode 100644
index 00000000000..24b201b4d06
--- /dev/null
+++ b/sql/updates/world/2015_12_29_01_world.sql
@@ -0,0 +1,7 @@
+-- 
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceGroup`=0 AND `SourceEntry`=23301 AND `ConditionTypeOrReference`=30;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(17,0,23301,0,0,30,1,192180,1,0,1,0,0,'','Do not cast Ebon Blade Banner if Ebon Blade Banner is planted'),
+(17,0,23301,0,1,30,1,192180,1,0,1,0,0,'','Do not cast Ebon Blade Banner if Ebon Blade Banner is planted'),
+(17,0,23301,0,2,30,1,192180,1,0,1,0,0,'','Do not cast Ebon Blade Banner if Ebon Blade Banner is planted'),
+(17,0,23301,0,3,30,1,192180,1,0,1,0,0,'','Do not cast Ebon Blade Banner if Ebon Blade Banner is planted');
diff --git a/sql/updates/world/2015_12_29_02_world.sql b/sql/updates/world/2015_12_29_02_world.sql
new file mode 100644
index 00000000000..3bfd0ba2a25
--- /dev/null
+++ b/sql/updates/world/2015_12_29_02_world.sql
@@ -0,0 +1,4 @@
+-- 
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceGroup`=0 AND `SourceEntry`=28516;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(17,0,28516,0,0,31,1,3,16329,0,0,0,0,'',"Only Dar'Khan Drathir can be a target for Sunwell Torrent");
diff --git a/sql/updates/world/2015_12_29_03_world.sql b/sql/updates/world/2015_12_29_03_world.sql
new file mode 100644
index 00000000000..f928061c269
--- /dev/null
+++ b/sql/updates/world/2015_12_29_03_world.sql
@@ -0,0 +1,4 @@
+-- 
+UPDATE `creature` SET `position_x`=-5.298958, `position_y`=-131.3911, `position_z`=-21.17339, `orientation`=4.817109 WHERE `guid`= 12686 AND `id`=17721;
+UPDATE `creature` SET `position_x`=-21.93356, `position_y`=-126.7303, `position_z`=-21.71569, `orientation`=4.939282 WHERE `guid`= 12687 AND `id`=17721;
+UPDATE `creature_equip_template` SET `ItemID1`=1903 WHERE `CreatureID`=17721;
diff --git a/sql/updates/world/2015_12_29_04_world.sql b/sql/updates/world/2015_12_29_04_world.sql
new file mode 100644
index 00000000000..22a1ee3edcf
--- /dev/null
+++ b/sql/updates/world/2015_12_29_04_world.sql
@@ -0,0 +1,4 @@
+-- 
+UPDATE `creature_template` SET `AIName`='' WHERE `entry`=30645;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 30645  AND `source_type` = 0;
+UPDATE `creature_template_addon` SET `auras`=57664 WHERE `entry`=30645;
diff --git a/sql/updates/world/2015_12_29_05_world.sql b/sql/updates/world/2015_12_29_05_world.sql
new file mode 100644
index 00000000000..056ea4fe230
--- /dev/null
+++ b/sql/updates/world/2015_12_29_05_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `Entry`=10415;
diff --git a/sql/updates/world/2015_12_29_06_world.sql b/sql/updates/world/2015_12_29_06_world.sql
new file mode 100644
index 00000000000..167c4c23005
--- /dev/null
+++ b/sql/updates/world/2015_12_29_06_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `creature_template` SET `flags_extra`=2 WHERE `entry` IN (27099, 30539);
diff --git a/sql/updates/world/2015_12_29_07_world.sql b/sql/updates/world/2015_12_29_07_world.sql
new file mode 100644
index 00000000000..ec71d28c787
--- /dev/null
+++ b/sql/updates/world/2015_12_29_07_world.sql
@@ -0,0 +1,13 @@
+-- 
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (16544, 16545) AND `source_type`=0;
+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
+(16545,0,0,0,0,0,100,3,0,0,0,0,11,30007,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Spellfilcher - In Combat - Cast 'Spatial Distortion' (No Repeat) (Normal Dungeon)"),
+(16545,0,1,0,0,0,100,2,4000,9000,5000,10000,11,37161,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Spellfilcher - In Combat - Cast 'Arcane Volley' (Normal Dungeon)"),
+(16545,0,2,0,0,0,100,2,8000,10000,10000,15000,11,30036,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Spellfilcher - In Combat - Cast 'Steal Magic' (Normal Dungeon)"),
+(16545,0,3,0,0,0,100,2,6000,12000,16000,16000,11,30039,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Spellfilcher - In Combat - Cast 'Transference' (Normal Dungeon)"),
+(16544,0,0,0,0,0,100,2,4000,7000,4000,8000,11,30014,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Thief - In Combat - Cast 'Cleave' (Normal Dungeon)"),
+(16544,0,1,0,5,0,100,2,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Thief - On Killed Unit - Say Line 0"),
+(16544,0,2,0,6,0,100,3,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Thief - On Just Died - Say Line 1"),
+(16544,0,3,0,0,0,100,3,0,0,0,0,75,29982,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Thief - In Combat - Add Aura 'Spatial Distortion' (No Repeat) (Normal Dungeon)"),
+(16544,0,4,0,0,0,100,2,15000,15000,20000,20000,11,30013,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Thief - In Combat - Cast 'Disarm' (Normal Dungeon)"),
+(16544,0,5,0,31,0,100,2,30013,0,1,1,13,0,100,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Thief - On Target Spellhit 'Disarm' - Set Single Threat 0-100 (Normal Dungeon)");
diff --git a/sql/updates/world/2015_12_29_08_world.sql b/sql/updates/world/2015_12_29_08_world.sql
new file mode 100644
index 00000000000..ce874d7a8d2
--- /dev/null
+++ b/sql/updates/world/2015_12_29_08_world.sql
@@ -0,0 +1,8 @@
+-- 
+-- Update (insert) missing CompletionText for Quest 2358, Horns of Nez'ra
+UPDATE `quest_request_items` SET `CompletionText`="Do you have the demon prince's horns?" WHERE `ID`= 2358;
+
+-- Insert completely missing `quest_offer_reward` info
+DELETE FROM `quest_offer_reward` WHERE `ID`= 2358;
+INSERT INTO `quest_offer_reward` (`ID`,`Emote1`,`Emote2`,`Emote3`,`Emote4`,`EmoteDelay1`,`EmoteDelay2`,`EmoteDelay3`,`EmoteDelay4`,`RewardText`,`VerifiedBuild`) VALUES
+(2358, 0, 0, 0, 0, 0, 0, 0, 0, "To deny Ravenholdt the artifact, would be to deny one's own existence. Well done, $C. You may yet walk among the assassins of Ravenholdt.$B$B As a young rogue adventuring in Darkshore, I discovered a tea that replenishes energy in combat. It has served me well throughout the years and now I pass on a taste of the thistle tea to you. Drink of it when you tire, $N, and fight with vigor once more!$B$B", 0);
diff --git a/sql/updates/world/2015_12_29_09_world.sql b/sql/updates/world/2015_12_29_09_world.sql
new file mode 100644
index 00000000000..d57785e8d88
--- /dev/null
+++ b/sql/updates/world/2015_12_29_09_world.sql
@@ -0,0 +1,49 @@
+-- 
+DELETE FROM `creature` WHERE `guid` IN (134960, 134962, 134968, 134969, 84418, 84423, 84402, 134976, 134977);
+DELETE FROM `game_event_creature` WHERE `guid` IN (134961, 134963, 84419,  84424,  134964, 134965, 134966, 134967, 84400,  84409,  84410,  84430,  84435,  84440,  84441,  134970, 134971, 134972, 134973, 134974, 134975, 134982, 134983, 86732,  86733,  134980, 134981, 134978, 134979, 727, 726, 725, 724, 134848, 134984, 134985, 134986, 134987, 134988, 134989, 134990, 134991, 134992, 134993, 134994);
+INSERT INTO `game_event_creature` (`eventEntry`, `guid`) VALUES 
+(2, 134961),
+(2, 134963),
+(2, 84419), 
+(2, 84424), 
+(2, 134964),
+(2, 134965),
+(2, 134966),
+(2, 134967),
+(2, 84400), 
+(2, 84409), 
+(2, 84410), 
+(2, 84430), 
+(2, 84435), 
+(2, 84440), 
+(2, 84441), 
+(2, 134970),
+(2, 134971),
+(2, 134972),
+(2, 134973),
+(2, 134974),
+(2, 134975),
+(2, 134982),
+(2, 134983),
+(2, 86732), 
+(2, 86733), 
+(2, 134980),
+(2, 134981),
+(2, 134978),
+(2, 134979),
+(2, 727),
+(2, 726),
+(2, 725),
+(2, 724),
+(2, 134848),
+(2, 134984),
+(2, 134985),
+(2, 134986),
+(2, 134987),
+(2, 134988),
+(2, 134989),
+(2, 134990),
+(2, 134991),
+(2, 134992),
+(2, 134993),
+(2, 134994);
diff --git a/sql/updates/world/2015_12_29_10_world.sql b/sql/updates/world/2015_12_29_10_world.sql
new file mode 100644
index 00000000000..919309dd558
--- /dev/null
+++ b/sql/updates/world/2015_12_29_10_world.sql
@@ -0,0 +1,22 @@
+-- 
+DELETE FROM `event_scripts` WHERE `id` IN (21075,21077,21076);
+INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES 
+-- summon corpes
+(21075, 0, 10, 33455, 20000, 0, 8441.057, 452.919, 596.070, 1.643),
+(21077, 0, 10, 33439, 20000, 0, 8461.75, 468.926, 596.072, 4.6392),
+(21076, 0, 10, 33457, 20000, 0, 8471.463,452.336,596.071,4.710),
+-- respawn sword and despawn after 20s
+(21076, 0, 9, 67923, 20, 0, 0, 0, 0, 0);
+
+-- set visual dead
+UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|32, `unit_flags2`=`unit_flags2`|1 WHERE `entry` IN (33439,33455,33457);
+
+-- sword despawn after 20s
+UPDATE `gameobject` SET `spawntimesecs`=-20 WHERE  `guid`=67923 LIMIT 1;
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (33455,33439);
+INSERT INTO `creature_template_addon` (`entry`, `auras`) VALUES 
+-- posion dummy
+(33455, '41290'),
+-- burning dummy
+(33439, '59216');
diff --git a/sql/updates/world/2015_12_29_11_world.sql b/sql/updates/world/2015_12_29_11_world.sql
new file mode 100644
index 00000000000..930baf15f78
--- /dev/null
+++ b/sql/updates/world/2015_12_29_11_world.sql
@@ -0,0 +1,21 @@
+-- 
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceGroup`=0 AND `SourceEntry`=58563;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(17,0,58563,0,0,31,1,3,30951,0,0,0,0,'',"Assassinate Restless Lookout can be used only on Restless lookout");
+
+DELETE FROM `creature_template_addon` WHERE `entry`=31110;
+INSERT INTO `creature_template_addon` (`entry`,`auras`) VALUES (31110,'58548');
+ 
+DELETE FROM `smart_scripts` WHERE  `entryorguid`=3095200 AND `id`>3;
+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 
+(3095200, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 45787, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hungering Plaguehound -  Script - Cast Sleeping Sleep'),
+(3095200, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hungering Plaguehound -  Script - React passif'),
+(3095200, 9, 6, 0, 0, 0, 100, 0, 15000, 15000, 0, 0, 28, 45787, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hungering Plaguehound - Script -  Remove Aura Sleeping Sleep'),
+(3095200, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hungering Plaguehound -  Script - Agressif'),
+(3095200, 9, 8, 0, 0, 0, 100, 0, 0, 0, 0, 0, 89, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hungering Plaguehound - Script -  Enable Random Move');
+
+UPDATE `smart_scripts` SET `action_param2`=2 WHERE  `entryorguid`=30952 AND `source_type`=0 AND `id`=0 AND `link`=0;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=30952;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(22, 1, 30952, 0, 0, 1, 1, 45787, 0, 0, 1, 0, 0, '', 'Only run SAI if unit does not have aura sleeping sleep');
diff --git a/sql/updates/world/2015_12_29_12_world.sql b/sql/updates/world/2015_12_29_12_world.sql
new file mode 100644
index 00000000000..c065e1d6a18
--- /dev/null
+++ b/sql/updates/world/2015_12_29_12_world.sql
@@ -0,0 +1,4 @@
+-- 
+UPDATE `creature_template` SET `npcflag`=32771, `AIName`='' WHERE `entry`=8888;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 8888  AND `source_type` = 0;
+UPDATE `creature_template_addon` SET `auras`=10848 WHERE `entry` IN (8888);
diff --git a/sql/updates/world/2015_12_29_13_world.sql b/sql/updates/world/2015_12_29_13_world.sql
new file mode 100644
index 00000000000..fc182ae49fb
--- /dev/null
+++ b/sql/updates/world/2015_12_29_13_world.sql
@@ -0,0 +1,4 @@
+-- 
+DELETE FROM `creature_template_addon` WHERE `entry`=25478;
+INSERT INTO `creature_template_addon` (`entry`,`bytes1`,`bytes2`,`emote`) VALUES
+(25478,0,4097,415);
diff --git a/sql/updates/world/2015_12_31_00_world.sql b/sql/updates/world/2015_12_31_00_world.sql
new file mode 100644
index 00000000000..b7c310323ed
--- /dev/null
+++ b/sql/updates/world/2015_12_31_00_world.sql
@@ -0,0 +1,55 @@
+-- 
+SET @guid=87490;
+DELETE FROM `creature` WHERE `guid` BETWEEN @guid+0 AND @guid+23;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`) VALUES
+(@guid+0, 32262, 571, 1, 1, 0, 0, 8210.67, 2058.87, 550.78, 1.8675, 300, 0, 0, 10080, 17272, 0),
+(@guid+1, 32262, 571, 1, 1, 0, 0, 8194.63, 2063.66, 550.78, 0.698132, 300, 0, 0, 10080, 17272, 0),
+(@guid+2, 32262, 571, 1, 1, 0, 0, 8200.36, 2050.99, 550.78, 1.43117, 300, 0, 0, 10080, 17272, 0),
+(@guid+3, 32297, 571, 1, 1, 0, 0, 8174.97, 2127.87, 499.92, 1.6057, 300, 0, 0, 10080, 17628, 0),
+(@guid+4, 32297, 571, 1, 1, 0, 0, 8204.41, 2125.31, 499.837, 4.72564, 300, 0, 0, 10080, 17628, 0),
+(@guid+5, 32297, 571, 1, 1, 0, 0, 8199.44, 2123.24, 499.837, 6.07577, 300, 0, 0, 10080, 17628, 0),
+(@guid+6, 32297, 571, 1, 1, 0, 0, 8151.77, 2128.06, 499.92, 1.65806, 300, 0, 0, 10080, 17628, 0),
+(@guid+7, 32297, 571, 1, 1, 0, 0, 8163.05, 2127.68, 499.92, 1.65806, 300, 0, 0, 10080, 17628, 0),
+(@guid+8, 32297, 571, 1, 1, 0, 0, 8144.97, 2100.36, 499.92, 4.7822, 300, 0, 0, 10080, 17628, 0),
+(@guid+9, 32297, 571, 1, 1, 0, 0, 8133.19, 2100.51, 499.92, 4.66003, 300, 0, 0, 10080, 17628, 0),
+(@guid+10, 32297, 571, 1, 1, 0, 0, 8157.47, 2102.37, 499.92, 3.08923, 300, 0, 0, 10080, 17628, 0),
+(@guid+11, 32297, 571, 1, 1, 0, 0, 8183.99, 2100.45, 499.92, 4.59022, 300, 0, 0, 10080, 17628, 0),
+(@guid+12, 32297, 571, 1, 1, 0, 0, 8172.34, 2100.43, 499.92, 4.67748, 300, 0, 0, 10080, 17628, 0),
+(@guid+13, 32297, 571, 1, 1, 0, 0, 8168.38, 2100.2, 499.92, 4.72984, 300, 0, 0, 10080, 17628, 0),
+(@guid+14, 32297, 571, 1, 1, 0, 0, 8202.52, 2103.62, 499.92, 0.10472, 300, 0, 0, 10080, 17628, 0),
+(@guid+15, 32297, 571, 1, 1, 0, 0, 8192.9, 2100.59, 499.92, 4.81711, 300, 0, 0, 10080, 17628, 0),
+(@guid+16, 32297, 571, 1, 1, 0, 0, 8214, 2126.49, 499.92, 6.26573, 300, 0, 0, 10080, 17628, 0),
+(@guid+17, 32297, 571, 1, 1, 0, 0, 8132.54, 2115.139, 499.837, 1.874436, 300, 0, 0, 10080, 17628, 0),
+(@guid+18, 32297, 571, 1, 1, 0, 0, 8133.218, 2119.662, 499.737, 3.914777, 300, 0, 0, 10080, 17628, 0),
+(@guid+19, 32297, 571, 1, 1, 0, 0, 8129.094, 2118.386, 499.737, 5.876702, 300, 0, 0, 10080, 17628, 0),
+(@guid+20, 32297, 571, 1, 1, 0, 0, 8203.914, 2120.223, 499.737, 2.054170, 300, 0, 0, 10080, 17628, 0),
+(@guid+21, 32297, 571, 1, 1, 0, 0, 8158.015, 2134.9663, 499.737, 4.673187, 300, 0, 0, 10080, 17628, 0),
+(@guid+22, 32297, 571, 1, 1, 0, 0, 8169.999, 2134.4260, 499.737, 4.708543, 300, 0, 0, 10080, 17628, 0),
+(@guid+23, 32276, 571, 1, 1, 0, 0, 8029.4, 2172.71, 499.918, 3.01942, 300, 0, 0, 12175, 0, 0);
+  
+DELETE FROM `creature_addon` WHERE `guid` BETWEEN @guid+0 AND @guid+23;
+INSERT INTO `creature_addon` (`guid`, `bytes2`, `emote`) VALUES
+(@guid+0, 1, 0), 
+(@guid+1, 1, 0),
+(@guid+2, 1, 0),
+(@guid+3, 1, 69),
+(@guid+4, 1, 396),
+(@guid+5, 1, 396),
+(@guid+6, 1, 69),
+(@guid+7, 1, 69),
+(@guid+8, 1, 69),
+(@guid+9, 1, 69),
+(@guid+10, 1, 69),
+(@guid+11, 1, 69),
+(@guid+12, 1, 69),
+(@guid+13, 1, 69),
+(@guid+14, 1, 69),
+(@guid+15, 1, 69),
+(@guid+16, 1, 69),
+(@guid+17, 1, 396),
+(@guid+18, 1, 396),
+(@guid+19, 1, 396),
+(@guid+20, 1, 396),
+(@guid+21, 1, 69),
+(@guid+22, 1, 69),
+(@guid+23, 1, 0);
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index 6ef9abe2267..7e56fd6ed4b 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -1655,13 +1655,13 @@ public:
                         break;
                     case 5:
                         Talk(SAY_IMPRISIONED_BERYL_5);
+                        caster->KilledMonsterCredit(NPC_IMPRISONED_BERYL_SORCERER);
                         break;
                     case 6:
                         Talk(SAY_IMPRISIONED_BERYL_6, caster);
                         break;
                     case 7:
                         Talk(SAY_IMPRISIONED_BERYL_7);
-                        caster->KilledMonsterCredit(NPC_IMPRISONED_BERYL_SORCERER);
                         break;
                 }
             }
diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp
index 7095c0e0b8d..16dc0d02960 100644
--- a/src/server/scripts/World/npc_taxi.cpp
+++ b/src/server/scripts/World/npc_taxi.cpp
@@ -162,9 +162,9 @@ public:
                 player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CRIMSONWING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+25);
             break;
         case 17209:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WILLIAMKEILAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 28);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WILLIAMKEILAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 29);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WILLIAMKEILAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 30);
+            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WILLIAMKEILAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26);
+            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WILLIAMKEILAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 27);
+            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WILLIAMKEILAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 28);
             break;
         }