Conflicts: src/server/game/Battlegrounds/ArenaTeam.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/StatSystem.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Spells/Spell.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp src/server/scripts/Kalimdor/zone_durotar.cpp src/server/scripts/Spells/spell_warrior.cpp