Fix malfunctions

project-fika · May 15, 2024 · cd8b035 · cd8b035
1 parent 9facf63
commit cd8b035
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientFirearmController.cs b/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientFirearmController.cs
@@ -446,7 +446,8 @@ public override void ShotMisfired(BulletClass ammo, Weapon.EMalfunctionState mal
                     IsPrimaryActive = true,
                     ShotType = shotType,
                     AmmoAfterShot = Item.GetCurrentMagazineCount(),
-                    Overheat = overheat
+                    Overheat = overheat,
+                    AmmoTemplate = ammo.TemplateId
                 }
             });
 

diff --git a/Fika.Core/Coop/ObservedClasses/HandsControllers/CoopObservedFirearmController.cs b/Fika.Core/Coop/ObservedClasses/HandsControllers/CoopObservedFirearmController.cs
@@ -197,6 +197,12 @@ public void HandleFirearmPacket(in WeaponPacket packet, InventoryControllerClass
                             break;
                     }
 
+                    if (string.IsNullOrEmpty(packet.ShotInfoPacket.AmmoTemplate))
+                    {
+                        FikaPlugin.Instance.FikaLogger.LogError("CoopObservedFirearmController::HandleFirearmPacket: AmmoTemplate was null or empty!");
+                        return;
+                    }
+
                     Weapon.MalfState.MalfunctionedAmmo = (BulletClass)Singleton<ItemFactory>.Instance.CreateItem(MongoID.Generate(), packet.ShotInfoPacket.AmmoTemplate, null);
                     if (weaponPrefab != null)
                     {