Reviews dealt with

space-wizards · Aug 4, 2024 · 6ce2670 · 6ce2670
1 parent 99d8997
commit 6ce2670
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 20 deletions.
diff --git a/Content.Shared/Damage/Components/DamageOnAttackedComponent.cs b/Content.Shared/Damage/Components/DamageOnAttackedComponent.cs
@@ -16,7 +16,7 @@ public sealed partial class DamageOnAttackedComponent : Component
     /// <summary>
     /// How much damage to apply to the person making contact
     /// </summary>
-    [DataField, AutoNetworkedField]
+    [DataField(required: true), AutoNetworkedField]
     public DamageSpecifier Damage = default!;
 
     /// <summary>

diff --git a/Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs b/Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs
@@ -9,15 +9,14 @@ namespace Content.Shared.Damage.Components;
 /// when attacking objects with the <see cref="DamageOnAttackedComponent"/>
 /// If the entity has sufficient protection, the entity will take no damage.
 /// </summary>
-
 [RegisterComponent, NetworkedComponent]
 public sealed partial class DamageOnAttackedProtectionComponent : Component, IClothingSlots
 {
     /// <summary>
     /// How much and what kind of damage to protect the user from
     /// when interacting with something with <see cref="DamageOnInteractComponent"/>
     /// </summary>
-    [DataField]
+    [DataField(required: true)]
     public DamageModifierSet DamageProtection = default!;
 
     /// <summary>

diff --git a/Content.Shared/Damage/Components/DamageOnInteractComponent.cs b/Content.Shared/Damage/Components/DamageOnInteractComponent.cs
@@ -16,7 +16,7 @@ public sealed partial class DamageOnInteractComponent : Component
     /// <summary>
     /// How much damage to apply to the person making contact
     /// </summary>
-    [DataField, AutoNetworkedField]
+    [DataField(required: true), AutoNetworkedField]
     public DamageSpecifier Damage = default!;
 
     /// <summary>

diff --git a/Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs b/Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs
@@ -17,7 +17,7 @@ public sealed partial class DamageOnInteractProtectionComponent : Component, ICl
     /// How much and what kind of damage to protect the user from
     /// when interacting with something with <see cref="DamageOnInteractComponent"/>
     /// </summary>
-    [DataField]
+    [DataField(required: true)]
     public DamageModifierSet DamageProtection = default!;
 
     /// <summary>

diff --git a/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs b/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs
@@ -80,15 +80,8 @@ private void OnAttacked(Entity<DamageOnAttackedComponent> entity, ref AttackedEv
         if (totalDamage != null && totalDamage.AnyPositive())
         {
             _adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} injured themselves by attacking {ToPrettyString(entity):target} and received {totalDamage.GetTotal():damage} damage");
-
-            if (!_gameTiming.IsFirstTimePredicted)
-                return;
-
             _audioSystem.PlayPredicted(entity.Comp.InteractSound, entity, args.User);
 
-            if (_net.IsServer)
-                return;
-
             if (entity.Comp.PopupText != null)
                 _popupSystem.PopupClient(Loc.GetString(entity.Comp.PopupText), args.User, args.User);
 

diff --git a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
@@ -65,17 +65,10 @@ private void OnHandInteract(Entity<DamageOnInteractComponent> entity, ref Intera
 
         if (totalDamage != null && totalDamage.AnyPositive())
         {
-            _adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} injured their hand by interacting with {ToPrettyString(args.Target):target} and received {totalDamage.GetTotal():damage} damage");
             args.Handled = true;
-
-            if (!_gameTiming.IsFirstTimePredicted)
-                return;
-
+            _adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} injured their hand by interacting with {ToPrettyString(args.Target):target} and received {totalDamage.GetTotal():damage} damage");
             _audioSystem.PlayPredicted(entity.Comp.InteractSound, args.Target, args.User);
 
-            if (_net.IsServer)
-                return;
-
             if (entity.Comp.PopupText != null)
                 _popupSystem.PopupClient(Loc.GetString(entity.Comp.PopupText), args.User, args.User);
         }