Revert "Fix goliath tentacle exploit (#37168)" (#37479)

* Revert "Fix goliath tentacle exploit (#37168)"

This reverts commit 6fbd0c9da1c10699322316528bdae1ef37bafa55.

* wawawewa

diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index acfc554fb128fab983996f8839aa049db2e04d27..e18a7f343977a7ec87e3a36aa671a19783a15861 100644 (file)
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -17,7 +17,6 @@ using Content.Shared.StatusEffect;
 using Content.Shared.Throwing;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
@@ -27,12 +26,10 @@ namespace Content.Shared.Stunnable;
 public abstract class SharedStunSystem : EntitySystem
 {
     [Dependency] private readonly ActionBlockerSystem _blocker = default!;
-    [Dependency] private readonly SharedBroadphaseSystem _broadphase = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
-    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly StandingStateSystem _standingState = default!;
     [Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
 
@@ -54,7 +51,6 @@ public abstract class SharedStunSystem : EntitySystem
         SubscribeLocalEvent<StunnedComponent, ComponentStartup>(UpdateCanMove);
         SubscribeLocalEvent<StunnedComponent, ComponentShutdown>(UpdateCanMove);
 
-        SubscribeLocalEvent<StunOnContactComponent, ComponentStartup>(OnStunOnContactStartup);
         SubscribeLocalEvent<StunOnContactComponent, StartCollideEvent>(OnStunOnContactCollide);
 
         // helping people up if they're knocked down
@@ -116,17 +112,6 @@ public abstract class SharedStunSystem : EntitySystem
         _blocker.UpdateCanMove(uid);
     }
 
-    private void OnStunOnContactStartup(Entity<StunOnContactComponent> ent, ref ComponentStartup args)
-    {
-        if (!TryComp<PhysicsComponent>(ent, out var body) ||
-            !TryComp<FixturesComponent>(ent, out var manager))
-            return;
-
-        _physics.SetBodyType(ent, BodyType.Dynamic, manager: manager, body: body);
-        _physics.SetCanCollide(ent, true, manager: manager, body: body);
-        _broadphase.RegenerateContacts((ent, body));
-    }
-
     private void OnStunOnContactCollide(Entity<StunOnContactComponent> ent, ref StartCollideEvent args)
     {
         if (args.OurFixtureId != ent.Comp.FixtureId)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
index a67db1e2933affb6d08e74b3a87ffa3448238662..c4c131a7ab21aca9ef5494b55eedd8c4e9c360d5 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
@@ -121,8 +121,10 @@
   id: GoliathTentacle
   name: tentacle
   components:
+  - type: Transform
+    anchored: True
   - type: Physics
-    bodyType: Dynamic
+    bodyType: Static
     canCollide: true
   - type: InteractionOutline
   - type: Sprite