juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up all missing EntitySystem proxy method uses (#38353)

Browse Source
This commit is contained in:
Tayrtahn
2025-06-26 19:50:49 -04:00
committed by GitHub
parent 73df3b1593
commit 75db49f9c0
185 changed files with 418 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
View File

@@ -102,7 +102,7 @@ namespace Content.Shared.Containers.ItemSlots
{
if (existing.Local)
Log.Error(
$"Duplicate item slot key. Entity: {EntityManager.GetComponent<MetaDataComponent>(uid).EntityName} ({uid}), key: {id}");
$"Duplicate item slot key. Entity: {Comp<MetaDataComponent>(uid).EntityName} ({uid}), key: {id}");
else
// server state takes priority
slot.CopyFrom(existing);
@@ -132,7 +132,7 @@ namespace Content.Shared.Containers.ItemSlots
itemSlots.Slots.Remove(slot.ContainerSlot.ID);
if (itemSlots.Slots.Count == 0)
EntityManager.RemoveComponent(uid, itemSlots);
RemComp(uid, itemSlots);
else
Dirty(uid, itemSlots);
}
@@ -206,7 +206,7 @@ namespace Content.Shared.Containers.ItemSlots
if (args.Handled)
return;
if (!EntityManager.TryGetComponent(args.User, out HandsComponent? hands))
if (!TryComp(args.User, out HandsComponent? hands))
return;
if (itemSlots.Slots.Count == 0)
@@ -700,7 +700,7 @@ namespace Content.Shared.Containers.ItemSlots
var verbSubject = slot.Name != string.Empty
? Loc.GetString(slot.Name)
: EntityManager.GetComponent<MetaDataComponent>(slot.Item.Value).EntityName ?? string.Empty;
: Comp<MetaDataComponent>(slot.Item.Value).EntityName ?? string.Empty;
AlternativeVerb verb = new()
{