Merge branch 'master' into dev

ACF-Team · Apr 16, 2024 · bda55a8 · bda55a8
2 parents f5329ea + 6698813
commit bda55a8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lua/entities/acf_rack/init.lua b/lua/entities/acf_rack/init.lua
@@ -110,7 +110,7 @@ do -- Spawning and Updating --------------------
 		Entity.ShortName      = Rack.ID
 		Entity.EntType        = Rack.EntType
 		Entity.RackData       = Rack
-		Entity.Caliber        = Rack.Caliber
+		Entity.Caliber        = Rack.Caliber or 0
 		Entity.MagSize        = Rack.MagSize or 1
 		Entity.ForcedIndex    = Entity.ForcedIndex and math.max(Entity.ForcedIndex, Entity.MagSize)
 		Entity.PointIndex     = 1
@@ -830,6 +830,7 @@ do -- Misc -------------------------------------
 		local Reload     = IsValid(Missile) and Missile.ReloadTime or 1
 
 		self.BulletData = BulletData
+		self.Caliber    = BulletData.Caliber
 		self.NextFire   = Point.NextFire
 		self.Jammed     = Point.Disabled