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

Fix smart equip bug (#10915)

Browse Source
This commit is contained in:
Leon Friedrich
2022-09-03 11:38:46 +12:00
committed by GitHub
parent d27065fc1f
commit 880fb36714
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Hands/Systems/HandsSystem.cs
View File

@@ -237,6 +237,8 @@ namespace Content.Server.Hands.Systems
HandleSmartEquip(session, "belt"); HandleSmartEquip(session, "belt");
} }
// why tf is this even in hands system.
// TODO: move to storage or inventory
private void HandleSmartEquip(ICommonSession? session, string equipmentSlot) private void HandleSmartEquip(ICommonSession? session, string equipmentSlot)
{ {
if (session is not IPlayerSession playerSession) if (session is not IPlayerSession playerSession)
@@ -245,20 +247,20 @@ namespace Content.Server.Hands.Systems
if (playerSession.AttachedEntity is not {Valid: true} plyEnt || !Exists(plyEnt)) if (playerSession.AttachedEntity is not {Valid: true} plyEnt || !Exists(plyEnt))
return; return;
if (!TryComp<SharedHandsComponent>(plyEnt, out var hands)) if (!_actionBlockerSystem.CanInteract(plyEnt, null))
return; return;
if (HasComp<StunnedComponent>(plyEnt)) if (!TryComp<SharedHandsComponent>(plyEnt, out var hands) || hands.ActiveHand == null)
return; return;
if (!_inventorySystem.TryGetSlotEntity(plyEnt, equipmentSlot, out var slotEntity) || if (!_inventorySystem.TryGetSlotEntity(plyEnt, equipmentSlot, out var slotEntity) ||
!TryComp(slotEntity, out ServerStorageComponent? storageComponent)) !TryComp(slotEntity, out ServerStorageComponent? storageComponent))
{ {
plyEnt.PopupMessage(Loc.GetString("hands-system-missing-equipment-slot", ("slotName", equipmentSlot))); _popupSystem.PopupEntity(Loc.GetString("hands-system-missing-equipment-slot", ("slotName", equipmentSlot)), plyEnt, Filter.SinglePlayer(session));
return; return;
} }
if (hands.ActiveHand?.HeldEntity != null) if (hands.ActiveHand.HeldEntity != null)
{ {
_storageSystem.PlayerInsertHeldEntity(slotEntity.Value, plyEnt, storageComponent); _storageSystem.PlayerInsertHeldEntity(slotEntity.Value, plyEnt, storageComponent);
} }
@@ -266,11 +268,11 @@ namespace Content.Server.Hands.Systems
{ {
if (storageComponent.StoredEntities.Count == 0) if (storageComponent.StoredEntities.Count == 0)
{ {
plyEnt.PopupMessage(Loc.GetString("hands-system-empty-equipment-slot", ("slotName", equipmentSlot))); _popupSystem.PopupEntity(Loc.GetString("hands-system-empty-equipment-slot", ("slotName", equipmentSlot)), plyEnt, Filter.SinglePlayer(session));
} }
else else
{ {
var lastStoredEntity = Enumerable.Last(storageComponent.StoredEntities); var lastStoredEntity = storageComponent.StoredEntities[^1];
if (storageComponent.Remove(lastStoredEntity)) if (storageComponent.Remove(lastStoredEntity))
{ {
PickupOrDrop(plyEnt, lastStoredEntity, animateUser: true, handsComp: hands); PickupOrDrop(plyEnt, lastStoredEntity, animateUser: true, handsComp: hands);