Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Fix assertion triggered

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/e71352db6f50d33de54b757a6af3cbe077136d65)
This commit is contained in:
hondacrx
2022-02-18 13:19:50 -05:00
parent 246c5c5eeb
commit 01b1b4f296
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/SpellEffects.cs
+22
View File
@@ -3763,10 +3763,21 @@ namespace Game.Spells
// This is a blizzlike mistake: this should be 2D distance according to projectile motion formulas, but Blizzard erroneously used 3D distance. // This is a blizzlike mistake: this should be 2D distance according to projectile motion formulas, but Blizzard erroneously used 3D distance.
float distXY = unitTarget.GetExactDist(pos); float distXY = unitTarget.GetExactDist(pos);
// Avoid division by 0
if (distXY < 0.001)
return;
float distZ = pos.GetPositionZ() - unitTarget.GetPositionZ(); float distZ = pos.GetPositionZ() - unitTarget.GetPositionZ();
float speedXY = effectInfo.MiscValue != 0 ? effectInfo.MiscValue / 10.0f : 30.0f; float speedXY = effectInfo.MiscValue != 0 ? effectInfo.MiscValue / 10.0f : 30.0f;
float speedZ = (float)((2 * speedXY * speedXY * distZ + MotionMaster.gravity * distXY * distXY) / (2 * speedXY * distXY)); float speedZ = (float)((2 * speedXY * speedXY * distZ + MotionMaster.gravity * distXY * distXY) / (2 * speedXY * distXY));
if (!float.IsFinite(speedZ))
{
Log.outError(LogFilter.Spells, $"Spell {m_spellInfo.Id} with SPELL_EFFECT_PULL_TOWARDS called with invalid speedZ. {GetDebugInfo()}");
return;
}
unitTarget.JumpTo(speedXY, speedZ, true, pos); unitTarget.JumpTo(speedXY, speedZ, true, pos);
} }
@@ -3788,11 +3799,22 @@ namespace Game.Spells
Position pos = m_targets.GetDstPos(); Position pos = m_targets.GetDstPos();
// This is a blizzlike mistake: this should be 2D distance according to projectile motion formulas, but Blizzard erroneously used 3D distance // This is a blizzlike mistake: this should be 2D distance according to projectile motion formulas, but Blizzard erroneously used 3D distance
float distXY = unitTarget.GetExactDist(pos); float distXY = unitTarget.GetExactDist(pos);
// Avoid division by 0
if (distXY < 0.001)
return;
float distZ = pos.GetPositionZ() - unitTarget.GetPositionZ(); float distZ = pos.GetPositionZ() - unitTarget.GetPositionZ();
float speedXY = effectInfo.MiscValue != 0 ? effectInfo.MiscValue / 10.0f : 30.0f; float speedXY = effectInfo.MiscValue != 0 ? effectInfo.MiscValue / 10.0f : 30.0f;
float speedZ = (float)((2 * speedXY * speedXY * distZ + MotionMaster.gravity * distXY * distXY) / (2 * speedXY * distXY)); float speedZ = (float)((2 * speedXY * speedXY * distZ + MotionMaster.gravity * distXY * distXY) / (2 * speedXY * distXY));
if (!float.IsFinite(speedZ))
{
Log.outError(LogFilter.Spells, $"Spell {m_spellInfo.Id} with SPELL_EFFECT_PULL_TOWARDS_DEST called with invalid speedZ. {GetDebugInfo()}");
return;
}
unitTarget.JumpTo(speedXY, speedZ, true, pos); unitTarget.JumpTo(speedXY, speedZ, true, pos);
} }