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

21
Content.Shared/Hands/Components/SharedHandsComponent.cs
View File

@@ -14,7 +14,6 @@ using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
@@ -216,23 +215,23 @@ namespace Content.Shared.Hands.Components
if (!TryGetActiveHand(out var hand))
return false;
return hand.HeldEntity != null;
return hand.HeldEntity != default;
}
public bool TryGetHeldEntity(string handName, [NotNullWhen(true)] out EntityUid? heldEntity)
public bool TryGetHeldEntity(string handName, out EntityUid heldEntity)
{
heldEntity = null;
heldEntity = default;
if (!TryGetHand(handName, out var hand))
return false;
heldEntity = hand.HeldEntity;
return heldEntity != null;
return heldEntity != default;
}
public bool TryGetActiveHeldEntity([NotNullWhen(true)] out EntityUid? heldEntity)
public bool TryGetActiveHeldEntity(out EntityUid heldEntity)
{
heldEntity = GetActiveHand()?.HeldEntity;
heldEntity = GetActiveHand()?.HeldEntity ?? default;
return heldEntity != null;
}
@@ -250,7 +249,7 @@ namespace Content.Shared.Hands.Components
{
foreach (var hand in Hands)
{
if (hand.HeldEntity != null)
if (hand.HeldEntity != default)
yield return hand.HeldEntity.Value;
}
}
@@ -264,7 +263,7 @@ namespace Content.Shared.Hands.Components
int acc = 0;
foreach (var hand in Hands)
{
if (hand.HeldEntity == null)
if (hand.HeldEntity == default)
acc += 1;
}
@@ -892,9 +891,9 @@ namespace Content.Shared.Hands.Components
public IContainer? Container { get; set; }
[ViewVariables]
public EntityUid? HeldEntity => Container?.ContainedEntities?.FirstOrDefault();
public EntityUid HeldEntity => Container?.ContainedEntities.FirstOrDefault() ?? EntityUid.Invalid;
public bool IsEmpty => HeldEntity == null;
public bool IsEmpty => HeldEntity == default;
public Hand(string name, HandLocation location, IContainer? container = null)
{

7
Content.Shared/Hands/SharedHandsSystem.cs
View File

@@ -1,9 +1,8 @@
using System;
using Content.Shared.Hands.Components;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
using System;
using Robust.Shared.IoC;
namespace Content.Shared.Hands
{
@@ -21,9 +20,9 @@ namespace Content.Shared.Hands
private void HandleSetHand(RequestSetHandEvent msg, EntitySessionEventArgs eventArgs)
{
var entity = eventArgs.SenderSession.AttachedEntityUid;
var entity = eventArgs.SenderSession.AttachedEntity;
if (entity == null || !EntityManager.TryGetComponent(entity.Value, out SharedHandsComponent? hands))
if (entity == default || !EntityManager.TryGetComponent(entity, out SharedHandsComponent? hands))
return;
hands.ActiveHand = msg.HandName;