Remove IUse (#7074)

This commit is contained in:
Leon Friedrich
2022-03-13 01:33:23 +13:00
committed by GitHub
parent c908a843ab
commit b1e719c70d
42 changed files with 109 additions and 158 deletions

View File

@@ -1,7 +1,5 @@
using System;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Threading.Tasks;
using Content.Shared.ActionBlocker;
using Content.Shared.Administration.Logs;
using Content.Shared.CombatMode;
@@ -26,6 +24,7 @@ using Content.Shared.Item;
using Robust.Shared.Player;
using Robust.Shared.Input;
using Robust.Shared.Timing;
using Content.Shared.Interaction.Events;
#pragma warning disable 618
@@ -786,7 +785,7 @@ namespace Content.Shared.Interaction
if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user))
return false;
var useMsg = new UseInHandEvent(user, used);
var useMsg = new UseInHandEvent(user);
RaiseLocalEvent(used, useMsg);
if (useMsg.Handled)
{
@@ -794,19 +793,6 @@ namespace Content.Shared.Interaction
return true;
}
var uses = AllComps<IUse>(used).ToList();
// Try to use item on any components which have the interface
foreach (var use in uses)
{
// If a Use returns a status completion we finish our interaction
if (use.UseEntity(new UseEntityEventArgs(user)))
{
_useDelay.BeginDelay(used, delayComponent);
return true;
}
}
// else, default to activating the item
return InteractionActivate(user, used, false, false, false);
}