fix PlayerFlashed.Projectile.Owner being incorrect in some cases

Author: markus-wa

datatables.go

@@ -432,7 +432,9 @@ func (p *Parser) nadeProjectileDestroyed(proj *common.GrenadeProjectile) {
 
 	delete(p.gameState.grenadeProjectiles, proj.EntityID)
 
-	p.gameState.lastFlash.projectile = proj
+	if proj.Weapon == common.EqFlash {
+		p.gameState.lastFlash.projectileByPlayer[proj.Owner] = proj
+	}
 }
 
 func (p *Parser) bindWeapon(entity *st.Entity, wepType common.EquipmentElement) {

demoinfocs_test.go

@@ -138,6 +138,13 @@ func TestDemoInfoCs(t *testing.T) {
 		}
 	})
 
+	// PlayerFlashed checks
+	p.RegisterEventHandler(func(flashed events.PlayerFlashed) {
+		if flashed.Projectile.Owner != flashed.Attacker {
+			t.Errorf("PlayerFlashed projectile.Owner != Attacker. tick=%d, owner=%s, attacker=%s\n", p.GameState().IngameTick(), flashed.Projectile.Owner, flashed.Attacker)
+		}
+	})
+
 	// Check some things at match start
 	p.RegisterEventHandler(func(events.MatchStart) {
 		participants := gs.Participants()
@@ -304,7 +311,7 @@ func TestDemoSet(t *testing.T) {
 				defer mustClose(t, f)
 
 				defer func() {
-					assert.Nil(t, recover(), "parsing of '%s/%s' paniced", demSetPath, name)
+					assert.Nil(t, recover(), "parsing of '%s/%s' panicked", demSetPath, name)
 				}()
 
 				p := dem.NewParser(f)

game_events.go

@@ -324,10 +324,11 @@ func (geh gameEventHandler) playerHurt(data map[string]*msg.CSVCMsg_GameEventKey
 }
 
 func (geh gameEventHandler) playerBlind(data map[string]*msg.CSVCMsg_GameEventKeyT) {
+	attacker := geh.gameState().lastFlash.player
 	geh.dispatch(events.PlayerFlashed{
 		Player:     geh.playerByUserID32(data["userid"].GetValShort()),
-		Attacker:   geh.gameState().lastFlash.player,
-		Projectile: geh.gameState().lastFlash.projectile,
+		Attacker:   attacker,
+		Projectile: geh.gameState().lastFlash.projectileByPlayer[attacker],
 	})
 }
 

game_state.go

@@ -24,14 +24,14 @@ type GameState struct {
 	gamePhase          common.GamePhase
 	isWarmupPeriod     bool
 	isMatchStarted     bool
-	lastFlash          lastFlasher    // Information about the last flash that exploded, used to find the attacker and projectile for player_blind events
+	lastFlash          lastFlash      // Information about the last flash that exploded, used to find the attacker and projectile for player_blind events
 	currentDefuser     *common.Player // Player currently defusing the bomb, if any
 	currentPlanter     *common.Player // Player currently planting the bomb, if any
 }
 
-type lastFlasher struct {
-	player     *common.Player
-	projectile *common.GrenadeProjectile
+type lastFlash struct {
+	player             *common.Player
+	projectileByPlayer map[*common.Player]*common.GrenadeProjectile
 }
 
 type ingameTickNumber int
@@ -143,6 +143,9 @@ func newGameState() *GameState {
 		infernos:           make(map[int]*common.Inferno),
 		entities:           make(map[int]*st.Entity),
 		conVars:            make(map[string]string),
+		lastFlash: lastFlash{
+			projectileByPlayer: make(map[*common.Player]*common.GrenadeProjectile),
+		},
 	}
 
 	gs.tState = common.NewTeamState(common.TeamTerrorists, gs.Participants().TeamMembers)

stringtables.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	bit "github.com/markus-wa/demoinfocs-golang/bitread"
-	common "github.com/markus-wa/demoinfocs-golang/common"
-	events "github.com/markus-wa/demoinfocs-golang/events"
-	msg "github.com/markus-wa/demoinfocs-golang/msg"
+	"github.com/markus-wa/demoinfocs-golang/common"
+	"github.com/markus-wa/demoinfocs-golang/events"
+	"github.com/markus-wa/demoinfocs-golang/msg"
 )
 
 const (
@@ -250,12 +250,12 @@ func parsePlayerInfo(reader io.Reader) *playerInfo {
 }
 
 var modelPreCacheSubstringToEq = map[string]common.EquipmentElement{
-	"flashbang_dropped":         common.EqFlash,
-	"fraggrenade_dropped":       common.EqHE,
-	"smokegrenade_thrown":       common.EqSmoke,
-	"molotov_dropped":           common.EqMolotov,
-	"incendiarygrenade_dropped": common.EqIncendiary,
-	"decoy_dropped":             common.EqDecoy,
+	"flashbang":         common.EqFlash,
+	"fraggrenade":       common.EqHE,
+	"smokegrenade":      common.EqSmoke,
+	"molotov":           common.EqMolotov,
+	"incendiarygrenade": common.EqIncendiary,
+	"decoy":             common.EqDecoy,
 	// @micvbang TODO: add all other weapons too.
 }