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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Slippery/SharedSlipperySystem.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
@@ -122,7 +121,7 @@ namespace Content.Shared.Slippery
foreach (var uid in component.Colliding.ToArray())
{
if (!uid.IsValid() || !EntityManager.TryGetEntity(uid, out var entity))
if (!uid.IsValid())
{
component.Colliding.Remove(uid);
component.Slipped.Remove(uid);
@@ -130,7 +129,7 @@ namespace Content.Shared.Slippery
continue;
}
if (!EntityManager.TryGetComponent(entity.Value, out PhysicsComponent? otherPhysics) ||
if (!EntityManager.TryGetComponent(uid, out PhysicsComponent? otherPhysics) ||
!body.GetWorldAABB().Intersects(otherPhysics.GetWorldAABB()))
{
component.Colliding.Remove(uid);