CS2 POV crash fixes

Author: markus-wa

pkg/demoinfocs/datatables.go

@@ -164,19 +164,30 @@ func (p *parser) bindBomb() {
 
 		if p.isSource2() {
 			ownerProp := bombEntity.PropertyValueMust("m_hOwnerEntity")
-			planter := p.gameState.Participants().FindByPawnHandle(ownerProp.Handle())
-			if planter == nil {
-				return
+
+			var planter *common.Player
+
+			if ownerProp.Any != nil {
+				planter = p.gameState.Participants().FindByPawnHandle(ownerProp.Handle())
+
+				if planter != nil {
+					planter.IsPlanting = false
+				}
 			}
+
 			isTicking := true
-			planter.IsPlanting = false
 
-			siteNumber := bombEntity.PropertyValueMust("m_nBombSite").Int()
+			siteNumberVal := bombEntity.PropertyValueMust("m_nBombSite")
+
 			site := events.BomsiteUnknown
-			if siteNumber == 0 {
-				site = events.BombsiteA
-			} else if siteNumber == 1 {
-				site = events.BombsiteB
+
+			if siteNumberVal.Any != nil {
+				siteNumber := siteNumberVal.Int()
+				if siteNumber == 0 {
+					site = events.BombsiteA
+				} else if siteNumber == 1 {
+					site = events.BombsiteB
+				}
 			}
 
 			if !p.disableMimicSource1GameEvents {
@@ -190,6 +201,10 @@ func (p *parser) bindBomb() {
 
 			// Set to true when the bomb has been planted and to false when it has been defused or has exploded.
 			bombEntity.Property("m_bBombTicking").OnUpdate(func(val st.PropertyValue) {
+				if val.Any == nil {
+					return
+				}
+
 				isTicking = val.BoolVal()
 				if isTicking {
 					return
@@ -214,31 +229,51 @@ func (p *parser) bindBomb() {
 
 			// Updated when a player starts/stops defusing the bomb
 			bombEntity.Property("m_hBombDefuser").OnUpdate(func(val st.PropertyValue) {
+				if val.Any == nil {
+					return
+				}
+
 				isValidPlayer := val.Handle() != constants.InvalidEntityHandleSource2
 				if isValidPlayer {
 					defuser := p.gameState.Participants().FindByPawnHandle(val.Handle())
 					p.gameState.currentDefuser = defuser
+					hasKit := false
+
+					// defuser may be nil for POV demos
+					if defuser != nil {
+						hasKit = defuser.HasDefuseKit()
+					}
+
 					if !p.disableMimicSource1GameEvents {
 						p.eventDispatcher.Dispatch(events.BombDefuseStart{
 							Player: defuser,
-							HasKit: defuser.HasDefuseKit(),
+							HasKit: hasKit,
 						})
 					}
+
 					return
 				}
 
-				isDefused := bombEntity.PropertyValueMust("m_bBombDefused").BoolVal()
-				if !isDefused && p.gameState.currentDefuser != nil {
-					p.eventDispatcher.Dispatch(events.BombDefuseAborted{
-						Player: p.gameState.currentDefuser,
-					})
+				isDefusedVal := bombEntity.PropertyValueMust("m_bBombDefused")
+
+				if isDefusedVal.Any != nil {
+					isDefused := isDefusedVal.BoolVal()
+					if !isDefused && p.gameState.currentDefuser != nil {
+						p.eventDispatcher.Dispatch(events.BombDefuseAborted{
+							Player: p.gameState.currentDefuser,
+						})
+					}
 				}
 
 				p.gameState.currentDefuser = nil
 			})
 
 			// Updated when the bomb has been planted and defused.
 			bombEntity.Property("m_bBombDefused").OnUpdate(func(val st.PropertyValue) {
+				if val.Any == nil {
+					return
+				}
+
 				isDefused := val.BoolVal()
 				if isDefused && !p.disableMimicSource1GameEvents {
 					defuser := p.gameState.Participants().FindByPawnHandle(bombEntity.PropertyValueMust("m_hBombDefuser").Handle())

pkg/demoinfocs/game_events.go

@@ -492,12 +492,13 @@ func (geh gameEventHandler) playerHurt(data map[string]*msg.CSVCMsg_GameEventKey
 		armorDamageTaken = 100
 	}
 
-	if player != nil {
-		if health == 0 {
+	if player != nil && (!geh.parser.isSource2() || (player.PlayerPawnEntity() != nil)) {
+		// m_iHealth & m_ArmorValue check for CS2 POV demos
+		if health == 0 && (!geh.parser.isSource2() || player.PlayerPawnEntity().Property("m_iHealth") != nil) {
 			healthDamageTaken = player.Health()
 		}
 
-		if armor == 0 {
+		if armor == 0 && (!geh.parser.isSource2() || player.PlayerPawnEntity().Property("m_ArmorValue") != nil) {
 			armorDamageTaken = player.Armor()
 		}
 	}

pkg/demoinfocs/sendtables2/entity.go

@@ -204,19 +204,23 @@ func coordFromCell(cell uint64, offset float32) float64 {
 }
 
 func (e *Entity) Position() r3.Vector {
-	cellXProp := e.Property(propCellX)
-	cellYProp := e.Property(propCellY)
-	cellZProp := e.Property(propCellZ)
-	offsetXProp := e.Property(propVecX)
-	offsetYProp := e.Property(propVecY)
-	offsetZProp := e.Property(propVecZ)
-
-	cellX := cellXProp.Value().S2UInt64()
-	cellY := cellYProp.Value().S2UInt64()
-	cellZ := cellZProp.Value().S2UInt64()
-	offsetX := offsetXProp.Value().Float()
-	offsetY := offsetYProp.Value().Float()
-	offsetZ := offsetZProp.Value().Float()
+	cellXVal := e.Property(propCellX).Value()
+	cellYVal := e.Property(propCellY).Value()
+	cellZVal := e.Property(propCellZ).Value()
+	offsetXVal := e.Property(propVecX).Value()
+	offsetYVal := e.Property(propVecY).Value()
+	offsetZVal := e.Property(propVecZ).Value()
+
+	if cellXVal.Any == nil || cellYVal.Any == nil || cellZVal.Any == nil || offsetXVal.Any == nil || offsetYVal.Any == nil || offsetZVal.Any == nil {
+		return r3.Vector{} // CS2 POV demos
+	}
+
+	cellX := cellXVal.S2UInt64()
+	cellY := cellYVal.S2UInt64()
+	cellZ := cellZVal.S2UInt64()
+	offsetX := offsetXVal.Float()
+	offsetY := offsetYVal.Float()
+	offsetZ := offsetZVal.Float()
 
 	return r3.Vector{
 		X: coordFromCell(cellX, offsetX),