cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix oopsie

This commit is contained in:
null 2024-07-25 00:22:07 +02:00
parent 0c72607391
commit 61244f8a2f
No known key found for this signature in database
GPG Key ID: 212F05528FD678BE
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
View File

@ -186,7 +186,7 @@ namespace Content.Server.Carrying
var targetParent = Transform(args.Target.Value).ParentUid;
if (args.Target.Value != component.Carrier && targetParent != component.Carrier && targetParent != uid)
args.Cancel();
args.Cancelled = true;
}
/// <summary>
@ -220,7 +220,7 @@ namespace Content.Server.Carrying
private void OnInteractedWith(EntityUid uid, BeingCarriedComponent component, GettingInteractedWithAttemptEvent args)
{
if (args.Uid != component.Carrier)
args.Cancel();
args.Cancelled = true;
}
private void OnPullAttempt(EntityUid uid, BeingCarriedComponent component, PullAttemptEvent args)

4
Content.Shared/Nyanotrasen/Interaction/NoNormalInteractionSystem.cs
View File

@ -1,6 +1,6 @@
using Content.Shared.Interaction.Events;
namespace Content.Shared.Interaction
namespace Content.Shared.Nyanotrasen.Interaction
{
public sealed class NoNormalInteractionSystem : EntitySystem
{
@ -12,7 +12,7 @@ namespace Content.Shared.Interaction
private void OnInteractionAttempt(EntityUid uid, NoNormalInteractionComponent component, InteractionAttemptEvent args)
{
args.Cancel();
args.Cancelled = true;
}
}
}

2
Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs
View File

@ -143,7 +143,7 @@ public abstract partial class SharedPseudoItemSystem : EntitySystem
private void OnInteractAttempt(EntityUid uid, PseudoItemComponent component, InteractionAttemptEvent args)
{
if (args.Uid == args.Target && component.Active)
args.Cancel();
args.Cancelled = true;
}
private void OnDoAfter(EntityUid uid, PseudoItemComponent component, DoAfterEvent args)