full sticky prediction (#30230)

* move all sticky stuff to shared and cleanup/grammar fix

* update imports and ref

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2024-08-08 23:36:15 +00:00
committed by GitHub
parent 15ae0435c4
commit e4ff5780d5
10 changed files with 362 additions and 409 deletions

View File

@@ -4,10 +4,10 @@ using Content.Server.Mind;
using Content.Server.Objectives.Components;
using Content.Server.Popups;
using Content.Server.Roles;
using Content.Server.Sticky.Events;
using Content.Shared.Interaction;
using Content.Shared.Ninja.Components;
using Content.Shared.Ninja.Systems;
using Content.Shared.Sticky;
using Robust.Shared.GameObjects;
namespace Content.Server.Ninja.Systems;
@@ -34,7 +34,7 @@ public sealed class SpiderChargeSystem : SharedSpiderChargeSystem
/// <summary>
/// Require that the planter is a ninja and the charge is near the target warp point.
/// </summary>
private void OnAttemptStick(EntityUid uid, SpiderChargeComponent comp, AttemptEntityStickEvent args)
private void OnAttemptStick(EntityUid uid, SpiderChargeComponent comp, ref AttemptEntityStickEvent args)
{
if (args.Cancelled)
return;
@@ -67,7 +67,7 @@ public sealed class SpiderChargeSystem : SharedSpiderChargeSystem
/// <summary>
/// Allows greentext to occur after exploding.
/// </summary>
private void OnStuck(EntityUid uid, SpiderChargeComponent comp, EntityStuckEvent args)
private void OnStuck(EntityUid uid, SpiderChargeComponent comp, ref EntityStuckEvent args)
{
comp.Planter = args.User;
}