Prevented magazine type from being applied when no magazines for said…

… gun exist
devyndamonster · Jan 3, 2022 · 7a02380 · 7a02380
1 parent d6de84a
commit 7a02380
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Scripts/MagazinePatcher.cs b/Scripts/MagazinePatcher.cs
@@ -593,7 +593,12 @@ private static void ApplyMagazineCache(CompatibleMagazineCache magazineCache)
                 {
                     FVRObject firearm = IM.OD[entry.FirearmID];
 
-                    firearm.MagazineType = entry.MagType;
+                    //Note, only apply magazine type if magazines exist for gun, because of some assumptions made by game code
+                    if (IM.CompatMags.ContainsKey(entry.MagType))
+                    {
+                        firearm.MagazineType = entry.MagType;
+                    }
+
                     firearm.RoundType = entry.BulletType;
                     firearm.ClipType = entry.ClipType;