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

Remove auras interrupted by falling when we fall to the ground or water

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/825719c25ca82ee94af85d1a7f2e99ce7ef5c9df)
This commit is contained in:
hondacrx
2019-08-31 15:29:15 -04:00
parent 07c46b3964
commit 86808ec9a5
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.cs
-1
View File
@@ -2078,7 +2078,6 @@ namespace Game.Entities
movementInfo.Pos.posZ, height, GetPositionZ(), movementInfo.jump.fallTime, height, damage, safe_fall); movementInfo.Pos.posZ, height, GetPositionZ(), movementInfo.jump.fallTime, height, damage, safe_fall);
} }
} }
RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags.Landing); // No fly zone - Parachute
} }
public void UpdateFallInformationIfNeed(MovementInfo minfo, ClientOpcodes opcode) public void UpdateFallInformationIfNeed(MovementInfo minfo, ClientOpcodes opcode)
{ {
Source/Game/Handlers/MovementHandler.cs
+4
View File
@@ -136,6 +136,10 @@ namespace Game
if (opcode == ClientOpcodes.MoveFallLand && plrMover && !plrMover.IsInFlight()) if (opcode == ClientOpcodes.MoveFallLand && plrMover && !plrMover.IsInFlight())
plrMover.HandleFall(movementInfo); plrMover.HandleFall(movementInfo);
// interrupt parachutes upon falling or landing in water
if (opcode == ClientOpcodes.MoveFallLand || opcode == ClientOpcodes.MoveStartSwim)
mover.RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags.Landing); // Parachutes
if (plrMover && movementInfo.HasMovementFlag(MovementFlag.Swimming) != plrMover.IsInWater()) if (plrMover && movementInfo.HasMovementFlag(MovementFlag.Swimming) != plrMover.IsInWater())
{ {
// now client not include swimming flag in case jumping under water // now client not include swimming flag in case jumping under water