Merge remote-tracking branch 'origin/master' into mw/update-protos-28.07.25

Author: markus-wa

pkg/demoinfocs/common/player.go

@@ -175,6 +175,21 @@ func (p *Player) Weapons() []*Equipment {
 	return res
 }
 
+// FlashbangCount returns the amount of flashbangs the player currently has in his inventory.
+func (p *Player) FlashbangCount() uint64 {
+	pawn := p.PlayerPawnEntity()
+	if pawn == nil {
+		return 0
+	}
+
+	flashCountProp, ok := pawn.PropertyValue("m_pWeaponServices.m_iAmmo.0014")
+	if !ok {
+		return 0
+	}
+
+	return flashCountProp.UInt64()
+}
+
 // IsSpottedBy returns true if the player has been spotted by the other player.
 // This is NOT "Line of Sight" / FOV - look up "CSGO TraceRay" for that.
 // May not behave as expected with multiple spotters.

pkg/demoinfocs/event-list-dump/14089.bin

@@ -396,8 +396,11 @@ func getGameEventListBinForProtocol(networkProtocol int) ([]byte, error) {
 	case networkProtocol < 14069:
 		return eventListFolder.ReadFile("event-list-dump/14023.bin")
 
-	default:
+	case networkProtocol < 14089:
 		return eventListFolder.ReadFile("event-list-dump/14070.bin")
+
+	default:
+		return eventListFolder.ReadFile("event-list-dump/14089.bin")
 	}
 }