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

Fix errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 21:02:04 +01:00
parent 2a3b7d809d
commit ab9d0cc6d8
94 changed files with 568 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Clothing/Components/ClothingComponent.cs
View File

@@ -21,6 +21,8 @@ namespace Content.Server.Clothing.Components
[NetworkedComponent()]
public class ClothingComponent : ItemComponent, IUse
{
[Dependency] private readonly IEntityManager _entities = default!;
public override string Name => "Clothing";
[ViewVariables]
@@ -60,8 +62,8 @@ namespace Content.Server.Clothing.Components
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
if (!_quickEquipEnabled) return false;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.User, out InventoryComponent? inv)
|| !IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.User, out HandsComponent? hands)) return false;
if (!_entities.TryGetComponent(eventArgs.User, out InventoryComponent? inv)
|| !_entities.TryGetComponent(eventArgs.User, out HandsComponent? hands)) return false;
foreach (var (slot, flag) in SlotMasks)
{
@@ -79,14 +81,14 @@ namespace Content.Server.Clothing.Components
{
hands.Drop(item.Owner);
inv.Equip(slot, item);
hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(Owner));
hands.PutInHand(_entities.GetComponent<ItemComponent>(Owner));
}
}
else
{
hands.Drop(Owner);
if (!TryEquip(inv, slot, eventArgs.User))
hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(Owner));
hands.PutInHand(_entities.GetComponent<ItemComponent>(Owner));
}
return true;
@@ -95,7 +97,7 @@ namespace Content.Server.Clothing.Components
return false;
}
public bool TryEquip(InventoryComponent inv, Slots slot, EntityUiduser)
public bool TryEquip(InventoryComponent inv, Slots slot, EntityUid user)
{
if (!inv.Equip(slot, this, true, out var reason))
{

2
Content.Server/Clothing/Components/MagbootsComponent.cs
View File

@@ -47,7 +47,7 @@ namespace Content.Server.Clothing.Components
}
}
public void Toggle(EntityUiduser)
public void Toggle(EntityUid user)
{
On = !On;
}