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

StunnableComponent cleanup, proper prediction for stuns and slips. (#3552)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-03-08 05:00:50 +01:00
committed by GitHub
parent 0ad70d62ec
commit 6c77801d90
13 changed files with 243 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Server.GameObjects.Components.GUI
{
[RegisterComponent]
[ComponentReference(typeof(SharedInventoryComponent))]
public class InventoryComponent : SharedInventoryComponent, IExAct, IEffectBlocker, IPressureProtection
public class InventoryComponent : SharedInventoryComponent, IExAct, IPressureProtection, IEffectBlocker
{
[Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
@@ -145,14 +145,7 @@ namespace Content.Server.GameObjects.Components.GUI
bool IEffectBlocker.CanSlip()
{
if (Owner.TryGetComponent(out InventoryComponent inventoryComponent) &&
inventoryComponent.TryGetSlotItem(EquipmentSlotDefines.Slots.SHOES, out ItemComponent shoes)
)
{
return EffectBlockerSystem.CanSlip(shoes.Owner);
}
return true;
return !TryGetSlotItem(EquipmentSlotDefines.Slots.SHOES, out ItemComponent shoes) || EffectBlockerSystem.CanSlip(shoes.Owner);
}
public override void OnRemove()