Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Spells/SpellInfo.h src/server/game/World/World.cpp
This commit is contained in:
commit
f7aedaef33
56 files changed
+455
-117
No files matched your search
@@ -3403,6 +3403,11 @@ void SpellMgr::LoadSpellInfoCorrections()
|
||||
case 34471: // The Beast Within
|
||||
spellInfo->AttributesEx5 |= SPELL_ATTR5_USABLE_WHILE_CONFUSED | SPELL_ATTR5_USABLE_WHILE_FEARED | SPELL_ATTR5_USABLE_WHILE_STUNNED;
|
||||
break;
|
||||
case 56606: // Ride Jokkum
|
||||
case 61791: // Ride Vehicle (Yogg-Saron)
|
||||
/// @todo: remove this when basepoints of all Ride Vehicle auras are calculated correctly
|
||||
spellInfo->Effects[EFFECT_0].BasePoints = 1;
|
||||
break;
|
||||
// ULDUAR SPELLS
|
||||
//
|
||||
case 62374: // Pursued (Flame Leviathan)
|
||||
@@ -3441,10 +3446,6 @@ void SpellMgr::LoadSpellInfoCorrections()
|
||||
// that will be clear if we get more spells with problem like this
|
||||
spellInfo->AttributesEx |= SPELL_ATTR1_DISPEL_AURAS_ON_IMMUNITY;
|
||||
break;
|
||||
case 61791: // Ride Vehicle (Yogg-Saron)
|
||||
// TODO: remove this when basepoints of all Ride Vehicle auras are calculated correctly
|
||||
spellInfo->Effects[EFFECT_0].BasePoints = 1;
|
||||
break;
|
||||
case 64468: // Empowering Shadows (Yogg-Saron)
|
||||
case 64486: // Empowering Shadows (Yogg-Saron)
|
||||
spellInfo->MaxAffectedTargets = 3; // same for both modes?
|
||||
|
||||
Reference in new issue
Block a user