Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

4
Content.Client/Interactable/InteractionSystem.cs
View File

@@ -9,10 +9,10 @@ namespace Content.Client.Interactable
{
public override bool CanAccessViaStorage(EntityUid user, EntityUid target)
{
if (!EntityManager.TryGetEntity(target, out var entity))
if (!EntityManager.EntityExists(target))
return false;
if (!entity.TryGetContainer(out var container))
if (!target.TryGetContainer(out var container))
return false;
if (!EntityManager.TryGetComponent(container.Owner, out ClientStorageComponent storage))

4
Content.Client/Interactable/UnobstructedExtensions.cs
View File

@@ -15,7 +15,7 @@ namespace Content.Client.Interactable
public static bool InRangeUnobstructed(
this LocalPlayer origin,
IEntity other,
EntityUid other,
float range = InteractionRange,
CollisionGroup collisionMask = CollisionGroup.Impassable,
Ignored? predicate = null,
@@ -78,7 +78,7 @@ namespace Content.Client.Interactable
bool popup = false)
{
var originEntity = origin.ControlledEntity;
if (originEntity == null)
if (originEntity == default)
{
// TODO: Take into account the player's camera position?
return false;