Inline TryGetComponent completely
This commit is contained in:
@@ -3,6 +3,7 @@ using Content.Shared.Storage.Components;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Shared.Containers;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
|
||||
namespace Content.Shared.Storage.EntitySystems
|
||||
{
|
||||
@@ -20,32 +21,32 @@ namespace Content.Shared.Storage.EntitySystems
|
||||
private void CounterEntityInserted(EntityUid uid, ItemCounterComponent itemCounter,
|
||||
EntInsertedIntoContainerMessage args)
|
||||
{
|
||||
if (!itemCounter.Owner.TryGetComponent(out AppearanceComponent? appearanceComponent)) return;
|
||||
|
||||
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(itemCounter.Owner.Uid, out AppearanceComponent? appearanceComponent)) return;
|
||||
|
||||
var count = GetCount(args, itemCounter);
|
||||
if (count == null)
|
||||
return;
|
||||
|
||||
|
||||
appearanceComponent.SetData(StackVisuals.Actual, count);
|
||||
if (itemCounter.MaxAmount != null)
|
||||
appearanceComponent.SetData(StackVisuals.MaxCount, itemCounter.MaxAmount);
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void CounterEntityRemoved(EntityUid uid, ItemCounterComponent itemCounter,
|
||||
EntRemovedFromContainerMessage args)
|
||||
{
|
||||
if (!itemCounter.Owner.TryGetComponent(out AppearanceComponent? appearanceComponent)) return;
|
||||
|
||||
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(itemCounter.Owner.Uid, out AppearanceComponent? appearanceComponent)) return;
|
||||
|
||||
var count = GetCount(args, itemCounter);
|
||||
if (count == null)
|
||||
return;
|
||||
|
||||
|
||||
appearanceComponent.SetData(StackVisuals.Actual, count);
|
||||
if (itemCounter.MaxAmount != null)
|
||||
appearanceComponent.SetData(StackVisuals.MaxCount, itemCounter.MaxAmount);
|
||||
}
|
||||
|
||||
|
||||
protected abstract int? GetCount(ContainerModifiedMessage msg, ItemCounterComponent itemCounter);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user