Remove ILand (#4582)

* Remove ILand

* Make land not handleable

* Rename ILand

Content.Server/Damage/Commands/GodModeCommand.cs

@@ -1,4 +1,5 @@
 using Content.Server.Administration;
+using Content.Server.Damage.Systems;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;

Content.Server/Damage/Components/DamageOnLandComponent.cs

@@ -1,44 +1,28 @@
 using Content.Shared.Damage;
-using Content.Shared.Damage.Components;
-using Content.Shared.Throwing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Prototypes;
-using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Damage.Components
 {
     [RegisterComponent]
-    public class DamageOnLandComponent : Component, ILand
+    public sealed class DamageOnLandComponent : Component
     {
         public override string Name => "DamageOnLand";
 
         [DataField("amount")]
         [ViewVariables(VVAccess.ReadWrite)]
-        private int _amount = 1;
+        public int Amount = 1;
 
         [DataField("ignoreResistances")]
         [ViewVariables(VVAccess.ReadWrite)]
-        private bool _ignoreResistances;
+        public bool IgnoreResistances;
 
         // TODO PROTOTYPE Replace this datafield variable with prototype references, once they are supported.
         // Also remove Initialize override, if no longer needed.
-        [DataField("damageType")]
-        private readonly string _damageTypeID = "Blunt";
+        [DataField("damageType")] public readonly string DamageTypeId = "Blunt";
+
         [ViewVariables(VVAccess.ReadWrite)]
         public DamageTypePrototype DamageType = default!;
-        protected override void Initialize()
-        {
-            base.Initialize();
-            DamageType = IoCManager.Resolve<IPrototypeManager>().Index<DamageTypePrototype>(_damageTypeID);
-        }
-
-        void ILand.Land(LandEventArgs eventArgs)
-        {
-            if (!Owner.TryGetComponent(out IDamageableComponent? damageable))
-                return;
-            damageable.TryChangeDamage(DamageType, _amount, _ignoreResistances);
-        }
     }
 }

Content.Server/Damage/Components/DamageOtherOnHitComponent.cs

@@ -1,3 +1,4 @@
+using Content.Server.Damage.Systems;
 using Content.Shared.Damage;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;

Content.Server/Damage/Systems/DamageOnHighSpeedImpactSystem.cs

@@ -11,7 +11,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Damage
+namespace Content.Server.Damage.Systems
 {
     [UsedImplicitly]
     internal sealed class DamageOnHighSpeedImpactSystem: EntitySystem

Content.Server/Damage/Systems/DamageOnLandSystem.cs

@@ -0,0 +1,35 @@
+using Content.Server.Damage.Components;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
+using Content.Shared.Throwing;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Damage.Systems
+{
+    public sealed class DamageOnLandSystem : EntitySystem
+    {
+        [Dependency] private readonly IPrototypeManager _protoManager = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<DamageOnLandComponent, ComponentInit>(HandleInit);
+            SubscribeLocalEvent<DamageOnLandComponent, LandEvent>(DamageOnLand);
+        }
+
+        private void HandleInit(EntityUid uid, DamageOnLandComponent component, ComponentInit args)
+        {
+            component.DamageType = _protoManager.Index<DamageTypePrototype>(component.DamageTypeId);
+        }
+
+        private void DamageOnLand(EntityUid uid, DamageOnLandComponent component, LandEvent args)
+        {
+            if (!ComponentManager.TryGetComponent<IDamageableComponent>(uid, out var damageable))
+                return;
+
+            damageable.TryChangeDamage(component.DamageType, component.Amount, component.IgnoreResistances);
+        }
+    }
+}

Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs

@@ -3,7 +3,7 @@ using Content.Shared.Damage.Components;
 using Content.Shared.Throwing;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Damage
+namespace Content.Server.Damage.Systems
 {
     public class DamageOtherOnHitSystem : EntitySystem
     {

Content.Server/Damage/Systems/GodmodeSystem.cs

@@ -7,7 +7,7 @@ using Content.Shared.GameTicking;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Damage
+namespace Content.Server.Damage.Systems
 {
     [UsedImplicitly]
     public class GodmodeSystem : EntitySystem