fix error if reserve-amo is nil (POV demos)

markus-wa · Jan 24, 2025 · f0b5a7e · f0b5a7e
1 parent 7cdb3cd
commit f0b5a7e
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/pkg/demoinfocs/common/equipment.go b/pkg/demoinfocs/common/equipment.go
@@ -417,7 +417,7 @@ func (e *Equipment) AmmoReserve() int {
 	}
 
 	s2Prop := e.Entity.Property("m_pReserveAmmo.0000")
-	if s2Prop != nil {
+	if s2Prop != nil && s2Prop.Value().Any != nil {
 		return s2Prop.Value().Int()
 	}
 
@@ -430,9 +430,17 @@ func (e *Equipment) AmmoReserve() int {
 		return 0
 	}
 
+	if e.Class() == EqClassEquipment {
+		return 0
+	}
+
 	// if the property doesn't exist we return 0 by default
 	val, _ := e.Entity.PropertyValue("m_iPrimaryReserveAmmoCount")
 
+	if val.Any == nil {
+		return 0
+	}
+
 	return val.IntVal
 }