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

Fixing some warnings (#6250)

Browse Source 
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
This commit is contained in:
wrexbe
2022-01-21 01:38:35 -08:00
committed by GitHub
parent 29b22e2871
commit cea1b21832
191 changed files with 341 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/AME/Components/AMEControllerComponent.cs
View File

@@ -132,7 +132,7 @@ namespace Content.Server.AME.Components
return;
}
var activeHandEntity = hands.GetActiveHand?.Owner;
var activeHandEntity = hands.GetActiveHandItem?.Owner;
if (activeHandEntity == null)
{
UserInterface?.Open(actor.PlayerSession);
@@ -341,13 +341,13 @@ namespace Content.Server.AME.Components
return true;
}
if (hands.GetActiveHand == null)
if (hands.GetActiveHandItem == null)
{
Owner.PopupMessage(args.User, Loc.GetString("ame-controller-component-interact-using-nothing-in-hands-text"));
return false;
}
var activeHandEntity = hands.GetActiveHand.Owner;
var activeHandEntity = hands.GetActiveHandItem.Owner;
if (_entities.HasComponent<AMEFuelContainerComponent?>(activeHandEntity))
{
if (HasJar)