Merge pull request #2867 from CombatExtended-Continued/vfammo

always replace vehicle ammunition ThingFilter
CombatExtended-Continued · Nov 4, 2023 · 40a6608 · 40a6608
2 parents 8940202 + d596e85
commit 40a6608
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Source/VehiclesCompat/VehiclesCompat/VehiclesCompat.cs b/Source/VehiclesCompat/VehiclesCompat/VehiclesCompat.cs
@@ -78,13 +78,17 @@ public static IEnumerable<ThingDef> _GetUsedAmmo()
                             if (asd != null)
                             {
                                 cetddme._ammoSet = asd;
-                                HashSet<ThingDef> allowedAmmo = (HashSet<ThingDef>)vtd.ammunition?.AllowedThingDefs;
-                                allowedAmmo.Clear();
+                                var ammunition = vtd.ammunition = new ThingFilter();
+                                vtd.genericAmmo = false;
+                                HashSet<ThingDef> allowedAmmo = (HashSet<ThingDef>)ammunition.AllowedThingDefs;
+
                                 foreach (var al in asd.ammoTypes)
                                 {
                                     allowedAmmo.Add(al.ammo);
                                     yield return al.ammo;
                                 }
+
+                                vtd.ammunition.ResolveReferences();
                             }
                         }
                     }