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

fixes a bunch of warnings

Browse Source
This commit is contained in:
Paul
2021-12-20 13:58:30 +01:00
parent 21174366b7
commit d4d85b663f
68 changed files with 113 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,9 +111,6 @@ namespace Content.Shared.Hands.Components
var hands = new List<HandVisualState>();
foreach (var hand in Hands)
{
if (hand.HeldEntity == null)
continue;
if (!entMan.TryGetComponent(hand.HeldEntity, out SharedItemComponent? item) || item.RsiPath == null)
continue;
@@ -233,8 +230,8 @@ namespace Content.Shared.Hands.Components
public bool TryGetActiveHeldEntity(out EntityUid heldEntity)
{
heldEntity = GetActiveHand()?.HeldEntity ?? default;
return heldEntity != null;
heldEntity = GetActiveHand()?.HeldEntity ?? EntityUid.Invalid;
return !heldEntity.Valid;
}
public bool IsHolding(EntityUid entity)
@@ -415,7 +412,7 @@ namespace Content.Shared.Hands.Components
/// </summary>
private bool CanRemoveHeldEntityFromHand(Hand hand)
{
if (hand.HeldEntity == null)
if (!hand.HeldEntity.Valid)
return false;
var heldEntity = hand.HeldEntity;
@@ -446,7 +443,7 @@ namespace Content.Shared.Hands.Components
/// </summary>
private void RemoveHeldEntityFromHand(Hand hand)
{
if (hand.HeldEntity == null)
if (!hand.HeldEntity.Valid)
return;
var heldEntity = hand.HeldEntity;
@@ -537,7 +534,7 @@ namespace Content.Shared.Hands.Components
private bool CanPutHeldEntityIntoContainer(Hand hand, IContainer targetContainer, bool checkActionBlocker)
{
if (hand.HeldEntity == null)
if (!hand.HeldEntity.Valid)
return false;
var heldEntity = hand.HeldEntity;
@@ -556,7 +553,7 @@ namespace Content.Shared.Hands.Components
/// </summary>
private void PutHeldEntityIntoContainer(Hand hand, IContainer targetContainer)
{
if (hand.HeldEntity == null)
if (!hand.HeldEntity.Valid)
return;
var heldEntity = hand.HeldEntity;