Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Guilds/Guild.cpp src/server/game/Handlers/MailHandler.cpp src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
commit
6161f69b7e
17 files changed
+260
-96
No files matched your search
@@ -3382,7 +3382,7 @@ void SpellMgr::LoadSpellInfoCorrections()
|
||||
break;
|
||||
case 69055: // Saber Lash (Lord Marrowgar)
|
||||
case 70814: // Saber Lash (Lord Marrowgar)
|
||||
spellInfo->Effects[EFFECT_0].RadiusEntry = sSpellRadiusStore.LookupEntry(EFFECT_RADIUS_5_YARDS); // 5yd
|
||||
spellInfo->Effects[EFFECT_0].RadiusEntry = sSpellRadiusStore.LookupEntry(EFFECT_RADIUS_8_YARDS); // 8yd
|
||||
break;
|
||||
case 69075: // Bone Storm (Lord Marrowgar)
|
||||
case 70834: // Bone Storm (Lord Marrowgar)
|
||||
|
||||
Reference in new issue
Block a user