Merge pull request #174 from markus-wa/issue/170-nil-WeaponInstance-PlayerHurt

PlayerHurt: fixed nil WeaponInstance for some cases

Author: markus-wa

datatables.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/golang/geo/r3"
+	"github.com/markus-wa/go-unassert"
 
 	"github.com/markus-wa/demoinfocs-golang/common"
 	"github.com/markus-wa/demoinfocs-golang/events"
@@ -24,36 +25,40 @@ const (
 
 func (p *Parser) mapEquipment() {
 	for _, sc := range p.stParser.ServerClasses() {
+		switch sc.Name() {
+		case "CC4":
+			p.equipmentMapping[sc] = common.EqBomb
+			continue
+
+		case "CWeaponNOVA":
+			fallthrough
+		case "CWeaponSawedoff":
+			fallthrough
+		case "CWeaponXM1014":
+			p.equipmentMapping[sc] = common.MapEquipment(strings.ToLower(sc.Name()[7:]))
+			continue
+		}
+
 		baseClasses := sc.BaseClasses()
 		for _, bc := range baseClasses {
 			if bc.Name() == "CBaseGrenade" { // Grenades projectiles, i.e. thrown by player
 				p.equipmentMapping[sc] = common.MapEquipment(strings.ToLower(sc.DataTableName()[3:]))
+				break
 			}
-		}
 
-		if len(baseClasses) > 6 && baseClasses[6].Name() == "CWeaponCSBase" {
-			if len(baseClasses) > 7 {
-				switch baseClasses[7].Name() {
-				case "CWeaponCSBaseGun":
-					// Most guns
-					p.equipmentMapping[sc] = common.MapEquipment(strings.ToLower(sc.DataTableName()[9:]))
-				case "CBaseCSGrenade":
-					// Nades
-					p.equipmentMapping[sc] = common.MapEquipment(strings.ToLower(sc.DataTableName()[3:]))
-				}
-			} else if sc.Name() == "CKnife" || (len(baseClasses) > 6 && baseClasses[6].Name() == "CKnife") {
+			if bc.Name() == "CKnife" {
 				p.equipmentMapping[sc] = common.EqKnife
-			} else {
-				switch sc.Name() {
-				case "CC4":
-					p.equipmentMapping[sc] = common.EqBomb
-				case "CWeaponNOVA":
-					fallthrough
-				case "CWeaponSawedoff":
-					fallthrough
-				case "CWeaponXM1014":
-					p.equipmentMapping[sc] = common.MapEquipment(strings.ToLower(sc.Name()[7:]))
-				}
+				break
+			}
+
+			if bc.Name() == "CWeaponCSBaseGun" { // most guns
+				p.equipmentMapping[sc] = common.MapEquipment(strings.ToLower(sc.DataTableName()[9:]))
+				break
+			}
+
+			if bc.Name() == "CBaseCSGrenade" { // nades
+				p.equipmentMapping[sc] = common.MapEquipment(strings.ToLower(sc.DataTableName()[3:]))
+				break
 			}
 		}
 	}
@@ -375,7 +380,17 @@ func (p *Parser) bindGrenadeProjectiles(entity *st.Entity) {
 	proj.EntityID = entityID
 	p.gameState.grenadeProjectiles[entityID] = proj
 
+	var wep common.EquipmentElement
 	entity.OnCreateFinished(func() {
+		// copy the weapon so it doesn't get overwritten by a new entity in Parser.weapons
+		wepCopy := *(getPlayerWeapon(proj.Thrower, wep))
+		proj.WeaponInstance = &wepCopy
+
+		unassert.NotNilf(proj.WeaponInstance, "couldn't find grenade instance for player")
+		if proj.WeaponInstance != nil {
+			unassert.NotNilf(proj.WeaponInstance.Owner, "getPlayerWeapon() returned weapon instance with Owner=nil")
+		}
+
 		p.gameEventHandler.addThrownGrenade(proj.Thrower, proj.WeaponInstance)
 
 		p.eventDispatcher.Dispatch(events.GrenadeProjectileThrow{
@@ -389,9 +404,7 @@ func (p *Parser) bindGrenadeProjectiles(entity *st.Entity) {
 
 	entity.FindPropertyI("m_nModelIndex").OnUpdate(func(val st.PropertyValue) {
 		proj.Weapon = p.grenadeModelIndices[val.IntVal]
-
-		equipment := common.NewEquipment(p.grenadeModelIndices[val.IntVal])
-		proj.WeaponInstance = &equipment
+		wep = p.grenadeModelIndices[val.IntVal]
 	})
 
 	// @micvbang: not quite sure what the difference between Thrower and Owner is.

game_events.go

@@ -117,7 +117,7 @@ func newGameEventHandler(parser *Parser) gameEventHandler {
 		"cs_round_start_beep":             nil,                                  // Round start beeps
 		"cs_win_panel_match":              geh.csWinPanelMatch,                  // Not sure, maybe match end event???
 		"cs_win_panel_round":              nil,                                  // Win panel, (==end of match?)
-		"decoy_detonate":                  geh.decoyDetonate,                    // Decoy exploded/expired
+		"decoy_detonate":                  delay(geh.decoyDetonate),             // Decoy exploded/expired. Delayed so deleteThrownGrenade() isn't called before player_hurt
 		"decoy_started":                   delay(geh.decoyStarted),              // Decoy started. Delayed because projectile entity is not yet created
 		"endmatch_cmm_start_reveal_items": nil,                                  // Drops
 		"entity_visible":                  nil,                                  // Dunno, only in locally recorded demo
@@ -679,7 +679,7 @@ func getPlayerWeapon(player *common.Player, wepType common.EquipmentElement) *co
 	if player != nil {
 		alternateWepType := common.EquipmentAlternative(wepType)
 		for _, wep := range player.Weapons() {
-			if wep.Weapon == wepType || wep.Weapon == alternateWepType {
+			if wep.Weapon == wepType || (alternateWepType != common.EqUnknown && wep.Weapon == alternateWepType) {
 				return wep
 			}
 		}