aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-10-01 21:25:41 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2014-10-01 21:25:41 +0200
commit7696bec538a6cab3b17133bc21d2e6411397c571 (patch)
treeb262bcc5806dc7b43f3b2c14f485a05ca1e7d61e
parent46acf64d0f44956b0ceee8ff00721ae05f363dcc (diff)
parent635756018658e9ca4ca8a365a320e35737024216 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
-rw-r--r--sql/updates/world/2014_10_01_00_world.sql1
-rw-r--r--src/server/game/Spells/SpellMgr.cpp4
2 files changed, 5 insertions, 0 deletions
diff --git a/sql/updates/world/2014_10_01_00_world.sql b/sql/updates/world/2014_10_01_00_world.sql
new file mode 100644
index 00000000000..2fc49640c60
--- /dev/null
+++ b/sql/updates/world/2014_10_01_00_world.sql
@@ -0,0 +1 @@
+UPDATE `quest_template` SET `SpecialFlags`=0 WHERE `Id` = 11122;
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index c43413d4cd6..90a7945beca 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -3328,6 +3328,10 @@ void SpellMgr::LoadSpellInfoCorrections()
case 17364: // Stormstrike
spellInfo->AttributesEx3 |= SPELL_ATTR3_STACK_FOR_DIFF_CASTERS;
break;
+ case 51798: // Brewfest - Relay Race - Intro - Quest Complete
+ //! HACK: This spell break quest complete for alliance and on retail not used °_O
+ spellInfo->Effects[EFFECT_0].Effect = 0;
+ break;
// ULDUAR SPELLS
//
case 62374: // Pursued (Flame Leviathan)