tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sliding bug (#24846)

Browse Source 
* Fix slip bug

* debug assert

* count

* DebugAssert
This commit is contained in:
Arendian
2024-02-03 09:10:50 +01:00
committed by GitHub
parent 864904dd5d
commit 9e484c4b61
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Shared/Slippery/SlidingSystem.cs
View File

@@ -59,5 +59,4 @@ public sealed class SlidingSystem : EntitySystem
Dirty(uid, component); Dirty(uid, component);
} }
} }

7
Content.Shared/Slippery/SlipperySystem.cs
View File

@@ -9,6 +9,7 @@ using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Systems; using Robust.Shared.Physics.Systems;
using Robust.Shared.Utility;
namespace Content.Shared.Slippery; namespace Content.Shared.Slippery;
@@ -75,7 +76,11 @@ public sealed class SlipperySystem : EntitySystem
_physics.SetLinearVelocity(other, physics.LinearVelocity * component.LaunchForwardsMultiplier, body: physics); _physics.SetLinearVelocity(other, physics.LinearVelocity * component.LaunchForwardsMultiplier, body: physics);
if (component.SuperSlippery) if (component.SuperSlippery)
EnsureComp<SlidingComponent>(other); {
var sliding = EnsureComp<SlidingComponent>(other);
sliding.CollidingEntities.Add(uid);
DebugTools.Assert(_physics.GetContactingEntities(other, physics).Contains(uid));
}
} }
var playSound = !_statusEffects.HasStatusEffect(other, "KnockedDown"); var playSound = !_statusEffects.HasStatusEffect(other, "KnockedDown");