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

More miscellaneous compiler warning fixes (#18228)

Browse Source
This commit is contained in:
metalgearsloth
2023-07-23 16:03:57 +10:00
committed by GitHub
parent cfb827c99b
commit e755509fc7
12 changed files with 103 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs
View File

@@ -21,32 +21,32 @@ namespace Content.Shared.Storage.EntitySystems
private void CounterEntityInserted(EntityUid uid, ItemCounterComponent itemCounter,
EntInsertedIntoContainerMessage args)
{
if (!EntityManager.TryGetComponent(itemCounter.Owner, out AppearanceComponent? appearanceComponent))
if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent))
return;
var count = GetCount(args, itemCounter);
if (count == null)
return;
_appearance.SetData(itemCounter.Owner, StackVisuals.Actual, count, appearanceComponent);
_appearance.SetData(uid, StackVisuals.Actual, count, appearanceComponent);
if (itemCounter.MaxAmount != null)
_appearance.SetData(itemCounter.Owner, StackVisuals.MaxCount, itemCounter.MaxAmount, appearanceComponent);
_appearance.SetData(uid, StackVisuals.MaxCount, itemCounter.MaxAmount, appearanceComponent);
}
private void CounterEntityRemoved(EntityUid uid, ItemCounterComponent itemCounter,
EntRemovedFromContainerMessage args)
{
if (!EntityManager.TryGetComponent(itemCounter.Owner, out AppearanceComponent? appearanceComponent))
if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearanceComponent))
return;
var count = GetCount(args, itemCounter);
if (count == null)
return;
_appearance.SetData(itemCounter.Owner, StackVisuals.Actual, count, appearanceComponent);
_appearance.SetData(uid, StackVisuals.Actual, count, appearanceComponent);
if (itemCounter.MaxAmount != null)
_appearance.SetData(itemCounter.Owner, StackVisuals.MaxCount, itemCounter.MaxAmount, appearanceComponent);
_appearance.SetData(uid, StackVisuals.MaxCount, itemCounter.MaxAmount, appearanceComponent);
}
protected abstract int? GetCount(ContainerModifiedMessage msg, ItemCounterComponent itemCounter);