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

Fix remnants of IAfterAttack

Browse Source
This commit is contained in:
zumorica
2020-05-24 13:47:13 +02:00
parent 1c00bf2855
commit 3cf2948f82
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/AnchorableComponent.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Server.GameObjects.Components
public bool InteractUsing(InteractUsingEventArgs eventArgs) public bool InteractUsing(InteractUsingEventArgs eventArgs)
{ {
if (!Owner.TryGetComponent(out PhysicsComponent physics) if (!Owner.TryGetComponent(out PhysicsComponent physics)
|| !eventArgs.AttackWith.TryGetComponent(out ToolComponent tool)) || !eventArgs.Using.TryGetComponent(out ToolComponent tool))
return false; return false;
if (!tool.UseTool(eventArgs.User, Owner, ToolQuality.Anchoring)) if (!tool.UseTool(eventArgs.User, Owner, ToolQuality.Anchoring))

2
Content.Server/GameObjects/Components/Doors/AirlockComponent.cs
View File

@@ -202,7 +202,7 @@ namespace Content.Server.GameObjects.Components.Doors
public bool InteractUsing(InteractUsingEventArgs eventArgs) public bool InteractUsing(InteractUsingEventArgs eventArgs)
{ {
if (!eventArgs.AttackWith.TryGetComponent<ToolComponent>(out var tool)) if (!eventArgs.Using.TryGetComponent<ToolComponent>(out var tool))
return false; return false;
if (!tool.UseTool(eventArgs.User, Owner, ToolQuality.Prying)) return false; if (!tool.UseTool(eventArgs.User, Owner, ToolQuality.Prying)) return false;

4
Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs
View File

@@ -13,7 +13,7 @@ using Robust.Shared.Serialization;
namespace Content.Server.GameObjects.Components.Interactable namespace Content.Server.GameObjects.Components.Interactable
{ {
[RegisterComponent] [RegisterComponent]
public class TilePryingComponent : Component, IAfterAttack public class TilePryingComponent : Component, IAfterInteract
{ {
#pragma warning disable 649 #pragma warning disable 649
[Dependency] private IEntitySystemManager _entitySystemManager; [Dependency] private IEntitySystemManager _entitySystemManager;
@@ -26,7 +26,7 @@ namespace Content.Server.GameObjects.Components.Interactable
public override string Name => "TilePrying"; public override string Name => "TilePrying";
private bool _toolComponentNeeded = true; private bool _toolComponentNeeded = true;
public void AfterAttack(AfterAttackEventArgs eventArgs) public void AfterInteract(AfterInteractEventArgs eventArgs)
{ {
TryPryTile(eventArgs.User, eventArgs.ClickLocation); TryPryTile(eventArgs.User, eventArgs.ClickLocation);
} }