Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.h src/server/game/Achievements/AchievementMgr.h src/server/game/Battlegrounds/Battleground.h src/server/game/DataStores/DBCEnums.h src/server/game/Entities/Object/ObjectDefines.h src/server/game/Entities/Object/Updates/UpdateFields.h src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Unit/Unit.h src/server/game/Groups/Group.h src/server/game/Guilds/Guild.h src/server/game/Instances/InstanceScript.h src/server/game/Miscellaneous/SharedDefines.h src/server/game/Movement/Spline/MoveSplineFlag.h src/server/game/OutdoorPvP/OutdoorPvP.h src/server/game/Quests/QuestDef.h src/server/game/Spells/Spell.h src/server/game/Spells/SpellInfo.h
This commit is contained in:
commit
68e0ef8039
115 files changed
+616
-447
No files matched your search
@@ -3428,6 +3428,9 @@ void SpellMgr::LoadDbcDataCorrections()
|
||||
case 71159: // Awaken Plagued Zombies
|
||||
spellInfo->DurationIndex = 21;
|
||||
break;
|
||||
case 70530: // Volatile Ooze Beam Protection (Professor Putricide)
|
||||
spellInfo->Effect[0] = SPELL_EFFECT_APPLY_AURA; // for an unknown reason this was SPELL_EFFECT_APPLY_AREA_AURA_RAID
|
||||
break;
|
||||
// THIS IS HERE BECAUSE COOLDOWN ON CREATURE PROCS IS NOT IMPLEMENTED
|
||||
case 71604: // Mutated Strength (Professor Putricide)
|
||||
case 72673: // Mutated Strength (Professor Putricide)
|
||||
|
||||
Reference in new issue
Block a user