From 17f8245d392ad787d6c206a03326ccd9899fa421 Mon Sep 17 00:00:00 2001 From: LaserJet Date: Wed, 7 Dec 2011 22:36:22 +0100 Subject: DB/Factionchange: Added missing data in player_factionchange_achievement table. --- ...7_00_world_player_factionchange_achievement.sql | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 sql/updates/world/2011_12_07_00_world_player_factionchange_achievement.sql (limited to 'sql') diff --git a/sql/updates/world/2011_12_07_00_world_player_factionchange_achievement.sql b/sql/updates/world/2011_12_07_00_world_player_factionchange_achievement.sql new file mode 100644 index 00000000000..7a19fa2cad0 --- /dev/null +++ b/sql/updates/world/2011_12_07_00_world_player_factionchange_achievement.sql @@ -0,0 +1,71 @@ +-- Missing achievement data (checked via DBC files) +DELETE FROM `player_factionchange_achievement` WHERE `alliance_id` IN (35,41,58,202,206,220,225,230,246,388,433,434,435,436,437,438,439,440,441,442,470,471,472,473,707,764,907,908,1167,1169,1172,1262,1466,1563,1681,1737,1752,1757,1762,1782,2016,2194,2536,2760,2761,2762,2763,2764,2770,2777,2778,2779,2780,2781,2782,2817,3356,3478,3676,3846,3851,3856,3857,4156,4296,4298,4784,4786); +INSERT INTO `player_factionchange_achievement` (`alliance_id`,`horde_id`) VALUES +(35,1359), +(41,1360), +(58,593), +(202,1502), +(206,1252), +(220,873), +(225,1164), +(230,1175), +(246,1005), +(388,1006), +(433,443), +(434,445), +(435,444), +(436,447), +(437,448), +(438,469), +(439,451), +(440,452), +(441,450), +(442,454), +(470,468), +(471,453), +(472,449), +(473,446), +(707,706), +(764,763), +(907,714), +(908,909), +(1167,1168), +(1169,1170), +(1172,1173), +(1262,1274), +(1466,926), +(1563,1784), +(1681,1682), +(1737,2476), +(1752,2776), +(1757,2200), +(1762,2192), +(1782,1783), +(2016,2017), +(2194,2195), +(2536,2537), +(2760,2768), +(2761,2767), +(2762,2766), +(2763,2769), +(2764,2765), +(2770,2771), +(2777,2786), +(2778,2785), +(2779,2784), +(2780,2787), +(2781,2783), +(2782,2788), +(2817,2816), +(3356,3357), +(3478,3656), +(3676,3677), +(3846,4176), +(3851,4177), +(3856,4256), +(3857,3957), +(4156,4079), +(4296,3778), +(4298,4297), +(4784,4785), +(4786,4790); -- cgit v1.2.3 From b05317650b470fe618c0b15a3d20656a074f76c5 Mon Sep 17 00:00:00 2001 From: Shocker Date: Thu, 8 Dec 2011 19:56:50 +0200 Subject: Core/Misc: Small changes after recent pulls --- ...7_00_world_player_factionchange_achievement.sql | 71 ---------------------- ...8_00_world_player_factionchange_achievement.sql | 71 ++++++++++++++++++++++ src/server/game/Entities/Unit/Unit.cpp | 2 +- 3 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 sql/updates/world/2011_12_07_00_world_player_factionchange_achievement.sql create mode 100644 sql/updates/world/2011_12_08_00_world_player_factionchange_achievement.sql (limited to 'sql') diff --git a/sql/updates/world/2011_12_07_00_world_player_factionchange_achievement.sql b/sql/updates/world/2011_12_07_00_world_player_factionchange_achievement.sql deleted file mode 100644 index 7a19fa2cad0..00000000000 --- a/sql/updates/world/2011_12_07_00_world_player_factionchange_achievement.sql +++ /dev/null @@ -1,71 +0,0 @@ --- Missing achievement data (checked via DBC files) -DELETE FROM `player_factionchange_achievement` WHERE `alliance_id` IN (35,41,58,202,206,220,225,230,246,388,433,434,435,436,437,438,439,440,441,442,470,471,472,473,707,764,907,908,1167,1169,1172,1262,1466,1563,1681,1737,1752,1757,1762,1782,2016,2194,2536,2760,2761,2762,2763,2764,2770,2777,2778,2779,2780,2781,2782,2817,3356,3478,3676,3846,3851,3856,3857,4156,4296,4298,4784,4786); -INSERT INTO `player_factionchange_achievement` (`alliance_id`,`horde_id`) VALUES -(35,1359), -(41,1360), -(58,593), -(202,1502), -(206,1252), -(220,873), -(225,1164), -(230,1175), -(246,1005), -(388,1006), -(433,443), -(434,445), -(435,444), -(436,447), -(437,448), -(438,469), -(439,451), -(440,452), -(441,450), -(442,454), -(470,468), -(471,453), -(472,449), -(473,446), -(707,706), -(764,763), -(907,714), -(908,909), -(1167,1168), -(1169,1170), -(1172,1173), -(1262,1274), -(1466,926), -(1563,1784), -(1681,1682), -(1737,2476), -(1752,2776), -(1757,2200), -(1762,2192), -(1782,1783), -(2016,2017), -(2194,2195), -(2536,2537), -(2760,2768), -(2761,2767), -(2762,2766), -(2763,2769), -(2764,2765), -(2770,2771), -(2777,2786), -(2778,2785), -(2779,2784), -(2780,2787), -(2781,2783), -(2782,2788), -(2817,2816), -(3356,3357), -(3478,3656), -(3676,3677), -(3846,4176), -(3851,4177), -(3856,4256), -(3857,3957), -(4156,4079), -(4296,3778), -(4298,4297), -(4784,4785), -(4786,4790); diff --git a/sql/updates/world/2011_12_08_00_world_player_factionchange_achievement.sql b/sql/updates/world/2011_12_08_00_world_player_factionchange_achievement.sql new file mode 100644 index 00000000000..7a19fa2cad0 --- /dev/null +++ b/sql/updates/world/2011_12_08_00_world_player_factionchange_achievement.sql @@ -0,0 +1,71 @@ +-- Missing achievement data (checked via DBC files) +DELETE FROM `player_factionchange_achievement` WHERE `alliance_id` IN (35,41,58,202,206,220,225,230,246,388,433,434,435,436,437,438,439,440,441,442,470,471,472,473,707,764,907,908,1167,1169,1172,1262,1466,1563,1681,1737,1752,1757,1762,1782,2016,2194,2536,2760,2761,2762,2763,2764,2770,2777,2778,2779,2780,2781,2782,2817,3356,3478,3676,3846,3851,3856,3857,4156,4296,4298,4784,4786); +INSERT INTO `player_factionchange_achievement` (`alliance_id`,`horde_id`) VALUES +(35,1359), +(41,1360), +(58,593), +(202,1502), +(206,1252), +(220,873), +(225,1164), +(230,1175), +(246,1005), +(388,1006), +(433,443), +(434,445), +(435,444), +(436,447), +(437,448), +(438,469), +(439,451), +(440,452), +(441,450), +(442,454), +(470,468), +(471,453), +(472,449), +(473,446), +(707,706), +(764,763), +(907,714), +(908,909), +(1167,1168), +(1169,1170), +(1172,1173), +(1262,1274), +(1466,926), +(1563,1784), +(1681,1682), +(1737,2476), +(1752,2776), +(1757,2200), +(1762,2192), +(1782,1783), +(2016,2017), +(2194,2195), +(2536,2537), +(2760,2768), +(2761,2767), +(2762,2766), +(2763,2769), +(2764,2765), +(2770,2771), +(2777,2786), +(2778,2785), +(2779,2784), +(2780,2787), +(2781,2783), +(2782,2788), +(2817,2816), +(3356,3357), +(3478,3656), +(3676,3677), +(3846,4176), +(3851,4177), +(3856,4256), +(3857,3957), +(4156,4079), +(4296,3778), +(4298,4297), +(4784,4785), +(4786,4790); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 3cbcaf069a8..298f9c60af8 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6057,7 +6057,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Glyph of Succubus case 56250: { - if(!target) + if (!target) return false; target->RemoveAurasByType(SPELL_AURA_PERIODIC_DAMAGE, 0, target->GetAura(32409)); // SW:D shall not be removed. target->RemoveAurasByType(SPELL_AURA_PERIODIC_DAMAGE_PERCENT); -- cgit v1.2.3 From c87d4a0b64499a6a8564e9c0ed44b2e7ceece569 Mon Sep 17 00:00:00 2001 From: Shocker Date: Thu, 8 Dec 2011 20:12:57 +0200 Subject: Scripts/Trial of the Crusader: Fix Twin Empathy (thanks to Amit86) Closes #3654 --- .../world/2011_12_08_01_world_creature_template_addon.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sql/updates/world/2011_12_08_01_world_creature_template_addon.sql (limited to 'sql') diff --git a/sql/updates/world/2011_12_08_01_world_creature_template_addon.sql b/sql/updates/world/2011_12_08_01_world_creature_template_addon.sql new file mode 100644 index 00000000000..e8a464146e0 --- /dev/null +++ b/sql/updates/world/2011_12_08_01_world_creature_template_addon.sql @@ -0,0 +1,11 @@ +-- Fix the HP sharing of Twin Valkyr - All Modes +DELETE FROM `creature_template_addon` WHERE `entry` IN (34497,35350,35351,35352,34496,35347,35348,35349); +INSERT INTO `creature_template_addon` (`entry`,`auras`) VALUES +(34497,'66133'), +(35350,'66133'), +(35351,'66133'), +(35352,'66133'), +(34496,'66132'), +(35347,'66132'), +(35348,'66132'), +(35349,'66132'); -- cgit v1.2.3 From 04862de237d4fb9138c96653d29a5f043254f49e Mon Sep 17 00:00:00 2001 From: durotar Date: Fri, 9 Dec 2011 12:15:19 +0000 Subject: DB/Gossips: Correct a duplicated gossip id (2011_10_23_04_world_sai.sql vs 2011_10_23_07_world_sai.sql) --- sql/updates/world/2011_12_08_00_world_gossip.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 sql/updates/world/2011_12_08_00_world_gossip.sql (limited to 'sql') diff --git a/sql/updates/world/2011_12_08_00_world_gossip.sql b/sql/updates/world/2011_12_08_00_world_gossip.sql new file mode 100644 index 00000000000..f6195d9d66e --- /dev/null +++ b/sql/updates/world/2011_12_08_00_world_gossip.sql @@ -0,0 +1,12 @@ +-- fixing conflict in number of gossip_menu_option.menu_id -- compare 2011_10_23_04_world_sai.sql with 2011_10_23_07_world_sai.sql +SET @ENTRY := 18417; +SET @OLDGOSSIP := 21304; +SET @NEWGOSSIP := 21312; +SET @QUEST_PUPIL := 10646; +-- Fixing smart_scripts +UPDATE `smart_scripts` SET `event_param1`=@NEWGOSSIP WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=2 AND `action_param1`=@QUEST_PUPIL; +-- Fixing gossip_menu_option +UPDATE `gossip_menu_option` SET `action_menu_id`=@NEWGOSSIP WHERE `menu_id`=@OLDGOSSIP+5; +DELETE FROM `gossip_menu_option` WHERE `menu_id`=@NEWGOSSIP; +INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`) VALUES +(@NEWGOSSIP,0,0,"There was something else I wanted to ask you, Altruis.",1,3,@OLDGOSSIP+0); -- cgit v1.2.3