events: fix nil Player values after disconnect (fixes #69)

in some cases we get events for players shortly after they disconnect.
we now keep these players stored in the gameState so we can still put them into future events.

Author: markus-wa

common/player.go

@@ -34,6 +34,7 @@ type Player struct {
 	Team                        Team
 	TeamState                   *TeamState // When keeping the reference make sure you notice when the player changes teams
 	IsBot                       bool
+	IsConnected                 bool
 	IsDucking                   bool
 	IsDefusing                  bool
 	HasDefuseKit                bool

datatables.go

@@ -204,6 +204,7 @@ func (p *Parser) bindNewPlayer(playerEntity st.IEntity) {
 	pl.EntityID = entityID
 	pl.Entity = playerEntity
 	pl.AdditionalPlayerInformation = &p.additionalPlayerInfo[entityID]
+	pl.IsConnected = true
 
 	playerEntity.OnDestroy(func() {
 		delete(p.gameState.playersByEntityID, entityID)

game_events.go

@@ -374,9 +374,9 @@ func (geh gameEventHandler) playerDisconnect(desc *msg.CSVCMsg_GameEventListDesc
 		geh.dispatch(events.PlayerDisconnected{
 			Player: pl,
 		})
-	}
 
-	delete(geh.gameState().playersByUserID, uid)
+		geh.playerByUserID(uid).IsConnected = false
+	}
 }
 
 func (geh gameEventHandler) playerTeam(desc *msg.CSVCMsg_GameEventListDescriptorT, ge *msg.CSVCMsg_GameEvent) {

game_state.go

@@ -150,7 +150,7 @@ func (ptcp Participants) ByUserID() map[int]*common.Player {
 	for k, v := range ptcp.playersByUserID {
 		// We need to check if the player entity hasn't been destroyed yet
 		// See https://github.com/markus-wa/demoinfocs-golang/issues/98
-		if v.Entity != nil {
+		if v.IsConnected && v.Entity != nil {
 			res[k] = v
 		}
 	}

game_state_test.go

@@ -138,7 +138,22 @@ func TestParticipants_SuppressNoEntity(t *testing.T) {
 	gs := newGameState()
 	pl := newPlayer()
 	gs.playersByUserID[0] = pl
-	gs.playersByUserID[1] = common.NewPlayer(0, func() int { return 0 })
+	pl2 := common.NewPlayer(0, func() int { return 0 })
+	pl2.IsConnected = true
+	gs.playersByUserID[1] = pl2
+
+	allPlayers := gs.Participants().All()
+
+	assert.ElementsMatch(t, []*common.Player{pl}, allPlayers)
+}
+
+func TestParticipants_SuppressNotConnected(t *testing.T) {
+	gs := newGameState()
+	pl := newPlayer()
+	gs.playersByUserID[0] = pl
+	pl2 := newPlayer()
+	pl2.IsConnected = false
+	gs.playersByUserID[1] = pl2
 
 	allPlayers := gs.Participants().All()
 
@@ -148,5 +163,6 @@ func TestParticipants_SuppressNoEntity(t *testing.T) {
 func newPlayer() *common.Player {
 	pl := common.NewPlayer(0, func() int { return 0 })
 	pl.Entity = new(st.Entity)
+	pl.IsConnected = true
 	return pl
 }