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

Fix for #22516 - mobs can no longer cause clumsy mobs to get hurt on tables (#22684)

Browse Source 
Fix for 22516 - mobs can no longer cause other mobs to be bonked against tables.
This commit is contained in:
J. Brown
2023-12-21 15:18:26 +00:00
committed by GitHub
parent 0c8b186e3a
commit 221eb561de
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Climbing/Systems/BonkSystem.cs
View File

@@ -3,6 +3,7 @@ using Content.Shared.Climbing.Components;
using Content.Shared.Damage; using Content.Shared.Damage;
using Content.Shared.DoAfter; using Content.Shared.DoAfter;
using Content.Shared.DragDrop; using Content.Shared.DragDrop;
using Content.Shared.Hands.Components;
using Content.Shared.IdentityManagement; using Content.Shared.IdentityManagement;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Interaction.Components; using Content.Shared.Interaction.Components;
@@ -35,7 +36,7 @@ public sealed partial class BonkSystem : EntitySystem
private void OnBonkDoAfter(EntityUid uid, Components.BonkableComponent component, BonkDoAfterEvent args) private void OnBonkDoAfter(EntityUid uid, Components.BonkableComponent component, BonkDoAfterEvent args)
{ {
if (args.Handled || args.Cancelled || args.Args.Target == null) if (args.Handled || args.Cancelled || args.Args.Target == null || args.Args.Target != args.Args.User)
return; return;
TryBonk(args.Args.User, uid, component); TryBonk(args.Args.User, uid, component);
@@ -76,7 +77,7 @@ public sealed partial class BonkSystem : EntitySystem
private void OnDragDrop(EntityUid uid, Components.BonkableComponent component, ref DragDropTargetEvent args) private void OnDragDrop(EntityUid uid, Components.BonkableComponent component, ref DragDropTargetEvent args)
{ {
if (args.Handled || !HasComp<ClumsyComponent>(args.Dragged)) if (args.Handled || !HasComp<ClumsyComponent>(args.Dragged) || !HasComp<HandsComponent>(args.User))
return; return;
var doAfterArgs = new DoAfterArgs(EntityManager, args.Dragged, component.BonkDelay, new BonkDoAfterEvent(), uid, target: uid) var doAfterArgs = new DoAfterArgs(EntityManager, args.Dragged, component.BonkDelay, new BonkDoAfterEvent(), uid, target: uid)

9
Content.Shared/Climbing/Systems/ClimbSystem.cs
View File

@@ -163,11 +163,16 @@ public sealed partial class ClimbSystem : VirtualController
if (args.Handled) if (args.Handled)
return; return;
var canVault = args.User == args.Dragged var canVault = args.User == args.Dragged
? CanVault(component, args.User, uid, out _) ? CanVault(component, args.User, uid, out _)
: CanVault(component, args.User, args.Dragged, uid, out _); : CanVault(component, args.User, args.Dragged, uid, out _);
args.CanDrop = canVault; args.CanDrop = canVault;
if (!HasComp<HandsComponent>(args.User))
args.CanDrop = false;
args.Handled = true; args.Handled = true;
} }
@@ -189,9 +194,7 @@ public sealed partial class ClimbSystem : VirtualController
private void OnClimbableDragDrop(EntityUid uid, ClimbableComponent component, ref DragDropTargetEvent args) private void OnClimbableDragDrop(EntityUid uid, ClimbableComponent component, ref DragDropTargetEvent args)
{ {
// definitely a better way to check if two entities are equal if (args.Handled)
// but don't have computer access and i have to do this without syntax
if (args.Handled || args.User != args.Dragged && !HasComp<HandsComponent>(args.User))
return; return;
TryClimb(args.User, args.Dragged, uid, out _, component); TryClimb(args.User, args.Dragged, uid, out _, component);