Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix inventory containers (#11944)

Browse Source
This commit is contained in:
Leon Friedrich
2022-10-16 17:16:27 +13:00
committed by GitHub
parent 7e41a7a31d
commit 243876474c
5 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/Inventory/ClientInventorySystem.cs
View File

@@ -43,7 +43,6 @@ namespace Content.Client.Inventory
SubscribeLocalEvent<ClientInventoryComponent, PlayerAttachedEvent>(OnPlayerAttached);
SubscribeLocalEvent<ClientInventoryComponent, PlayerDetachedEvent>(OnPlayerDetached);
SubscribeLocalEvent<ClientInventoryComponent, ComponentInit>(OnInit);
SubscribeLocalEvent<ClientInventoryComponent, ComponentShutdown>(OnShutdown);
SubscribeLocalEvent<ClientInventoryComponent, DidEquipEvent>((_, comp, args) =>
@@ -145,16 +144,17 @@ namespace Content.Client.Inventory
base.Shutdown();
}
private void OnInit(EntityUid uid, ClientInventoryComponent component, ComponentInit args)
protected override void OnInit(EntityUid uid, InventoryComponent component, ComponentInit args)
{
_clothingVisualsSystem.InitClothing(uid, component);
base.OnInit(uid, component, args);
_clothingVisualsSystem.InitClothing(uid, (ClientInventoryComponent) component);
if (!_prototypeManager.TryIndex(component.TemplateId, out InventoryTemplatePrototype? invTemplate))
return;
foreach (var slot in invTemplate.Slots)
{
TryAddSlotDef(uid, component, slot);
TryAddSlotDef(uid, (ClientInventoryComponent)component, slot);
}
}
@@ -191,7 +191,6 @@ namespace Content.Client.Inventory
if (!component.SlotData.TryAdd(newSlotDef.Name, newSlotData))
return false;
if (owner == _playerManager.LocalPlayer?.ControlledEntity)
OnSlotAdded?.Invoke(newSlotData);
return true;
@@ -283,6 +282,8 @@ namespace Content.Client.Inventory
public EntityUid? HeldEntity => Container?.ContainedEntity;
public bool Blocked;
public bool Highlighted;
[ViewVariables]
public ContainerSlot? Container;
public bool HasSlotGroup => SlotDef.SlotGroup != "Default";
public Vector2i ButtonOffset => SlotDef.UIWindowPosition;