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

1
Content.Client/AI/ClientPathfindingDebugSystem.cs
View File

@@ -18,7 +18,6 @@ namespace Content.Client.AI
#if DEBUG
public class ClientPathfindingDebugSystem : EntitySystem
{
[Dependency] private readonly IOverlayManager _overlayManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;

5
Content.Client/Body/UI/BodyScannerBoundUserInterface.cs
View File

@@ -14,9 +14,6 @@ namespace Content.Client.Body.UI
[ViewVariables]
private BodyScannerDisplay? _display;
[ViewVariables]
private EntityUid _entity;
public BodyScannerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { }
protected override void Open()
@@ -43,7 +40,7 @@ namespace Content.Client.Body.UI
throw new ArgumentException($"Received an invalid entity with id {scannerState.Uid} for body scanner with id {Owner.Owner} at {entMan.GetComponent<TransformComponent>(Owner.Owner).MapPosition}");
}
_display?.UpdateDisplay(_entity);
_display?.UpdateDisplay(scannerState.Uid);
}
protected override void Dispose(bool disposing)

9
Content.Client/Body/UI/BodyScannerDisplay.cs
View File

@@ -104,7 +104,7 @@ namespace Content.Client.Body.UI
public void UpdateDisplay(EntityUid entity)
{
if(entity == null)
if(!entity.Valid)
return;
_currentEntity = entity;
@@ -125,12 +125,7 @@ namespace Content.Client.Body.UI
public void BodyPartOnItemSelected(ItemListSelectedEventArgs args)
{
if (_currentEntity == null)
return;
var body = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SharedBodyComponent>(_currentEntity);
if (body == null)
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedBodyComponent>(_currentEntity, out var body))
{
return;
}

2
Content.Client/ContextMenu/UI/EntityMenuPresenter.cs
View File

@@ -288,7 +288,7 @@ namespace Content.Client.ContextMenu.UI
// Get the first entity in the sub-menus
var entity = GetFirstEntityOrNull(element.SubMenu);
if (entity == null)
if (!entity.Valid)
{
// This whole element has no associated entities. We should remove it
element.Dispose();

2
Content.Client/Decals/DecalOverlay.cs
View File

@@ -4,10 +4,8 @@ using Robust.Client.Graphics;
using Robust.Client.Utility;
using Robust.Shared.Enums;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
using Robust.Shared.Maths;
namespace Content.Client.Decals
{

3
Content.Client/Hands/HandsGui.xaml.cs
View File

@@ -99,8 +99,7 @@ namespace Content.Client.Hands
_itemSlotManager.SetItemSlot(newButton, hand.HeldItem);
// Show blocked overlay if hand is blocked.
newButton.Blocked.Visible =
hand.HeldItem != null && IoCManager.Resolve<IEntityManager>().HasComponent<HandVirtualItemComponent>(hand.HeldItem);
newButton.Blocked.Visible = IoCManager.Resolve<IEntityManager>().HasComponent<HandVirtualItemComponent>(hand.HeldItem);
}
if (TryGetActiveHand(out var activeHand))

2
Content.Client/Inventory/StrippableBoundUserInterface.cs
View File

@@ -29,7 +29,7 @@ namespace Content.Client.Inventory
{
base.Open();
_strippingMenu = new StrippingMenu($"{Loc.GetString("strippable-bound-user-interface-stripping-menu-title",("ownerName", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Owner).EntityName))}");
_strippingMenu = new StrippingMenu($"{Loc.GetString("strippable-bound-user-interface-stripping-menu-title",("ownerName", IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Owner).EntityName))}");
_strippingMenu.OnClose += Close;
_strippingMenu.OpenCentered();

2
Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs
View File

@@ -36,7 +36,7 @@ namespace Content.Client.MedicalScanner.UI
}
else
{
text.Append($"{Loc.GetString("medical-scanner-window-entity-health-text", ("entityName", Name: entities.GetComponent<MetaDataComponent>(state.Entity.Value).EntityName))}\n");
text.Append($"{Loc.GetString("medical-scanner-window-entity-health-text", ("entityName", entities.GetComponent<MetaDataComponent>(state.Entity.Value).EntityName))}\n");
var totalDamage = state.DamagePerType.Values.Sum();