Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4

Conflicts:
	README.md
	sql/updates/world/2015_02_06_13_world_335.sql
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
Carbenium committed 2015-07-21 21:45:04 +02:00
commit 7d5d040948
25 files changed
+467 -391

No files matched your search

+3 -1
View File
@@ -3037,6 +3037,8 @@ void SpellMgr::LoadSpellInfoCorrections()
switch (spellInfo->Id)
{
case 70743: // AoD Special
case 70614: // AoD Special - Vegard
case 42436: // Drink! (Brewfest)
spellInfo->Effects[EFFECT_0].TargetA = SpellImplicitTargetInfo(TARGET_UNIT_TARGET_ANY);
break;
@@ -3739,7 +3741,7 @@ void SpellMgr::LoadSpellInfoCorrections()
case 45440: // Steam Tonk Controller
case 60256: // Collect Sample
// Crashes client on pressing ESC
spellInfo->AttributesEx4 &= ~SPELL_ATTR4_TRIGGERED;
spellInfo->AttributesEx4 &= ~SPELL_ATTR4_CAN_CAST_WHILE_CASTING;
break;
case 96942: // Gaze of Occu'thar
case 101009: // Gaze of Occu'thar