Merge remote-tracking branch 'origin/master' into mmaps
Conflicts: src/server/game/Entities/Unit/Unit.cpp src/server/game/Movement/MotionMaster.cpp src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp src/server/game/Movement/Spline/MoveSplineInit.cpp
This commit is contained in:
commit
e6a07076c3
126 files changed
+783
-859
No files matched your search
@@ -6514,8 +6514,8 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
|
||||
RemoveAura(57934);
|
||||
if (!redirectTarget)
|
||||
break;
|
||||
CastSpell(this,59628,true);
|
||||
CastSpell(redirectTarget,57933,true);
|
||||
CastSpell(this, 59628, true);
|
||||
CastSpell(redirectTarget, 57933, true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -15228,7 +15228,7 @@ void Unit::UpdateAuraForGroup(uint8 slot)
|
||||
}
|
||||
}
|
||||
|
||||
float Unit::CalculateDefaultCoefficient(SpellInfo const *spellInfo, DamageEffectType damagetype) const
|
||||
float Unit::CalculateDefaultCoefficient(SpellInfo const* spellInfo, DamageEffectType damagetype) const
|
||||
{
|
||||
// Damage over Time spells bonus calculation
|
||||
float DotFactor = 1.0f;
|
||||
|
||||
Reference in new issue
Block a user