Conflicts: src/server/game/Entities/Unit/Unit.cpp src/server/game/Handlers/MovementHandler.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/scripts/Spells/spell_hunter.cpp src/server/scripts/Spells/spell_warlock.cpp
Conflicts: src/server/game/Entities/Unit/Unit.cpp src/server/game/Handlers/MovementHandler.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/scripts/Spells/spell_hunter.cpp src/server/scripts/Spells/spell_warlock.cpp