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

ActionBlocker CanUnequip uses EntityUid exclusively

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 13:46:48 +01:00
parent a69387d741
commit cba96ad830
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Inventory/Components/InventoryComponent.cs
View File

@@ -330,7 +330,7 @@ namespace Content.Server.Inventory.Components
/// </returns> /// </returns>
public bool CanUnequip(Slots slot, bool mobCheck = true) public bool CanUnequip(Slots slot, bool mobCheck = true)
{ {
if (mobCheck && !EntitySystem.Get<ActionBlockerSystem>().CanUnequip(Owner)) if (mobCheck && !EntitySystem.Get<ActionBlockerSystem>().CanUnequip(OwnerUid))
return false; return false;
var inventorySlot = _slotContainers[slot]; var inventorySlot = _slotContainers[slot];

14
Content.Shared/ActionBlocker/ActionBlockerSystem.cs
View File

@@ -107,18 +107,12 @@ namespace Content.Shared.ActionBlocker
return !ev.Cancelled; return !ev.Cancelled;
} }
public bool CanUnequip(IEntity entity)
{
var ev = new UnequipAttemptEvent(entity);
RaiseLocalEvent(entity.Uid, ev);
return !ev.Cancelled;
}
public bool CanUnequip(EntityUid uid) public bool CanUnequip(EntityUid uid)
{ {
return CanUnequip(EntityManager.GetEntity(uid)); var ev = new UnequipAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
return !ev.Cancelled;
} }
public bool CanChangeDirection(IEntity entity) public bool CanChangeDirection(IEntity entity)

6
Content.Shared/Inventory/Events/UnequipAttemptEvent.cs
View File

@@ -4,11 +4,11 @@ namespace Content.Shared.Inventory.Events
{ {
public class UnequipAttemptEvent : CancellableEntityEventArgs public class UnequipAttemptEvent : CancellableEntityEventArgs
{ {
public UnequipAttemptEvent(IEntity entity) public UnequipAttemptEvent(EntityUid uid)
{ {
Entity = entity; Uid = uid;
} }
public IEntity Entity { get; } public EntityUid Uid { get; }
} }
} }