Fix damage on host

project-fika · Jun 19, 2024 · 26ef09d · 26ef09d
1 parent 8e257b8
commit 26ef09d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/Fika.Core/Coop/Players/CoopPlayer.cs b/Fika.Core/Coop/Players/CoopPlayer.cs
@@ -230,16 +230,21 @@ public override void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartTy
 
         public override GClass1688 ApplyShot(DamageInfo damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider, GStruct389 shotId)
         {
-            if (damageInfo.DamageType is not EDamageType.Sniper or EDamageType.Landmine)
+            if (damageInfo.DamageType is EDamageType.Sniper or EDamageType.Landmine)
             {
-                return null;
+                return SimulatedApplyShot(damageInfo, bodyPartType, colliderType, armorPlateCollider, shotId);
             }
 
-            if (damageInfo.Player != null && damageInfo.Player.iPlayer is not CoopBot)
+            if (damageInfo.Player != null && damageInfo.Player.iPlayer is CoopBot)
             {
-                return null;
+                return SimulatedApplyShot(damageInfo, bodyPartType, colliderType, armorPlateCollider, shotId);
             }
 
+            return null;
+        }
+
+        private GClass1688 SimulatedApplyShot(DamageInfo damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider, GStruct389 shotId)
+        {
             ActiveHealthController activeHealthController = ActiveHealthController;
             if (activeHealthController != null && !activeHealthController.IsAlive)
             {

diff --git a/Fika.Core/Coop/Players/ObservedCoopPlayer.cs b/Fika.Core/Coop/Players/ObservedCoopPlayer.cs
@@ -300,9 +300,10 @@ public override void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartTy
 
         public override GClass1688 ApplyShot(DamageInfo damageInfo, EBodyPart bodyPartType, EBodyPartColliderType colliderType, EArmorPlateCollider armorPlateCollider, GStruct389 shotId)
         {
+            ShotReactions(damageInfo, bodyPartType);
+
             if (damageInfo.DamageType == EDamageType.Sniper && FikaBackendUtils.IsServer)
             {
-                ShotReactions(damageInfo, bodyPartType);
                 PacketSender.DamagePackets.Enqueue(new()
                 {
                     Damage = damageInfo.Damage,
@@ -358,7 +359,6 @@ public override GClass1688 ApplyShot(DamageInfo damageInfo, EBodyPart bodyPartTy
                         damageInfo.DidArmorDamage = num;
                     }
                     damageInfo.DidBodyDamage = damageInfo.Damage;
-                    ShotReactions(damageInfo, bodyPartType);
                     ReceiveDamage(damageInfo.Damage, bodyPartType, damageInfo.DamageType, num, hitInfo.Material);
 
                     PacketSender.DamagePackets.Enqueue(new()
@@ -393,11 +393,8 @@ public override GClass1688 ApplyShot(DamageInfo damageInfo, EBodyPart bodyPartTy
                 }
                 return null;
             }
-            else
-            {
-                ShotReactions(damageInfo, bodyPartType);
-                return null;
-            }
+
+            return null;
         }
 
         public override void SetControllerInsteadRemovedOne(Item removingItem, Callback callback)