From 08edf75cd17188500d8236e11f07f924577aade9 Mon Sep 17 00:00:00 2001 From: Hondacrx Date: Sat, 31 Aug 2024 17:18:19 -0400 Subject: [PATCH] Core/Spells: Implemented SPELL_ATTR9_JUMPCHARGE__NO_FACING_CONTROL Port From (https://github.com/TrinityCore/TrinityCore/commit/486641063e9b88d84e38e4cee3bfc2fb3e0bffc6) --- Source/Framework/Constants/Spells/SpellConst.cs | 2 +- Source/Game/Spells/SpellEffects.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Framework/Constants/Spells/SpellConst.cs b/Source/Framework/Constants/Spells/SpellConst.cs index 0644a2b1b..216664125 100644 --- a/Source/Framework/Constants/Spells/SpellConst.cs +++ b/Source/Framework/Constants/Spells/SpellConst.cs @@ -1989,7 +1989,7 @@ namespace Framework.Constants AllowCastWhileChanneling = 0x100000, // Allow Cast While Channeling SuppressVisualKitErrors = 0x200000, // Suppress Visual Kit Errors (client only) SpellcastOverrideInSpellbook = 0x400000, // Spellcast Override In Spellbook (client only) - Unk23 = 0x800000, // 23 + JumpchargeNoFacingControl = 0x800000, // JumpCharge - no facing control Unk24 = 0x1000000, // 24 Unk25 = 0x2000000, // 25 Unk26 = 0x4000000, // 26 diff --git a/Source/Game/Spells/SpellEffects.cs b/Source/Game/Spells/SpellEffects.cs index ab29ad67b..de130148b 100644 --- a/Source/Game/Spells/SpellEffects.cs +++ b/Source/Game/Spells/SpellEffects.cs @@ -540,7 +540,7 @@ namespace Game.Spells JumpArrivalCastArgs arrivalCast = new(); arrivalCast.SpellId = effectInfo.TriggerSpell; arrivalCast.Target = unitTarget.GetGUID(); - unitCaster.GetMotionMaster().MoveJump(unitTarget, speedXY, speedZ, EventId.Jump, facing, false, arrivalCast); + unitCaster.GetMotionMaster().MoveJump(unitTarget, speedXY, speedZ, EventId.Jump, facing, m_spellInfo.HasAttribute(SpellAttr9.JumpchargeNoFacingControl), arrivalCast); } [SpellEffectHandler(SpellEffectName.JumpDest)] @@ -571,7 +571,7 @@ namespace Game.Spells JumpArrivalCastArgs arrivalCast = new(); arrivalCast.SpellId = effectInfo.TriggerSpell; - unitCaster.GetMotionMaster().MoveJump(destTarget, speedXY, speedZ, EventId.Jump, facing, false, arrivalCast); + unitCaster.GetMotionMaster().MoveJump(destTarget, speedXY, speedZ, EventId.Jump, facing, m_spellInfo.HasAttribute(SpellAttr9.JumpchargeNoFacingControl), arrivalCast); } TeleportToOptions GetTeleportOptions(WorldObject caster, Unit unitTarget, SpellDestination targetDest) @@ -5604,7 +5604,7 @@ namespace Game.Spells effectExtra.ParabolicCurveId = jumpParams.ParabolicCurveId.Value; } - unitCaster.GetMotionMaster().MoveJumpWithGravity(destTarget, speed, jumpParams.JumpGravity, EventId.Jump, facing, false, arrivalCast, effectExtra); + unitCaster.GetMotionMaster().MoveJumpWithGravity(destTarget, speed, jumpParams.JumpGravity, EventId.Jump, facing, m_spellInfo.HasAttribute(SpellAttr9.JumpchargeNoFacingControl), arrivalCast, effectExtra); } [SpellEffectHandler(SpellEffectName.LearnTransmogSet)]