Fixed prop decoding + nade & bomb event bug

Also added a FIXME & Player.IsBot


Former-commit-id: e739f07072b4cef2a17ce1a956190e5d021f7e66

Author: markus-wa

common/structs.go

@@ -29,10 +29,11 @@ type PlayerInfo struct {
 }
 
 type Player struct {
-	Name                        string
+	EntityId                    int
 	SteamId                     int64
+	Name                        string
+	IsBot                       bool
 	Position                    r3.Vector
-	EntityId                    int
 	Hp                          int
 	Armor                       int
 	LastAlivePosition           r3.Vector

events/events.go

@@ -87,7 +87,7 @@ type WeaponFiredEvent struct {
 }
 
 type NadeEventIf interface {
-	dummy()
+	dummyNade()
 }
 
 // Nade exploded
@@ -98,7 +98,7 @@ type NadeEvent struct {
 }
 
 // Make NadeEvents implement NadeEventIf
-func (NadeEvent) dummy() {}
+func (NadeEvent) dummyNade() {}
 
 type HeExplodedEvent struct {
 	NadeEvent
@@ -138,15 +138,15 @@ type PlayerFlashedEvent struct {
 }
 
 type BombEventIf interface {
-	dummy()
+	dummyBomb()
 }
 
 type BombEvent struct {
 	Player *common.Player
 	Site   rune
 }
 
-func (BombEvent) dummy() {}
+func (BombEvent) dummyBomb() {}
 
 type BombBeginPlant struct {
 	BombEvent

parser.go

@@ -56,7 +56,8 @@ func (p *Parser) Participants() []*common.Player {
 func (p *Parser) PlayingParticipants() []*common.Player {
 	r := make([]*common.Player, 0, len(p.connectedPlayers))
 	for _, ptcp := range p.connectedPlayers {
-		if ptcp.Team != common.Team_Spectators {
+		// FIXME: Why do we have to check for nil here???
+		if ptcp != nil && ptcp.Team != common.Team_Spectators {
 			r = append(r, ptcp)
 		}
 	}

parsing.go

@@ -76,6 +76,7 @@ func (p *Parser) ParseNextTick() bool {
 
 			pl.Name = rp.Name
 			pl.SteamId = rp.XUID
+			pl.IsBot = rp.IsFakePlayer
 			pl.AdditionalPlayerInformation = &p.additionalPlayerInfo[pl.EntityId]
 
 			if pl.IsAlive() {