Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Movement: Replace MotionMaster::MoveJumpWithGravity with new jump height based MoveJump

Browse Source
This commit is contained in:
Shauren
2025-11-24 12:07:19 +01:00
parent ed599208ea
commit 95ca714824
13 changed files with 112 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/game/Spells/SpellEffects.cpp
View File

@@ -5877,9 +5877,13 @@ void Spell::EffectJumpCharge()
if (!params)
return;
float speed = params->Speed;
if (params->TreatSpeedAsMoveTimeSeconds)
speed = unitCaster->GetExactDist(destTarget) / params->MoveTimeInSec;
std::variant<std::monostate, float, Milliseconds> speedOrTime = [params]() -> std::variant<std::monostate, float, Milliseconds>
{
if (params->TreatSpeedAsMoveTimeSeconds)
return duration_cast<Milliseconds>(FloatSeconds(params->MoveTimeInSec));
return params->Speed;
}();
MovementFacingTarget facing;
if (Unit const* target = m_targets.GetUnitTarget())
@@ -5910,8 +5914,8 @@ void Spell::EffectJumpCharge()
effectExtra->ParabolicCurveId = *params->ParabolicCurveId;
}
unitCaster->GetMotionMaster()->MoveJumpWithGravity(*destTarget, speed, params->JumpGravity, EVENT_JUMP, facing,
m_spellInfo->HasAttribute(SPELL_ATTR9_JUMPCHARGE__NO_FACING_CONTROL),
unitCaster->GetMotionMaster()->MoveJump(EVENT_JUMP, *destTarget, speedOrTime, params->MinHeight, params->MaxHeight,
facing, m_spellInfo->HasAttribute(SPELL_ATTR9_JUMPCHARGE__NO_FACING_CONTROL), params->UnlimitedSpeed, {},
arrivalCast ? &*arrivalCast : nullptr,
effectExtra ? &*effectExtra : nullptr);
}