players: fix weapon attribution (#148)

Author: markus-wa

datatables.go

@@ -276,8 +276,14 @@ func (p *Parser) bindNewPlayer(playerEntity st.IEntity) {
 				}
 				cache[i2] = entityID
 
-				// Attribute weapon to player
 				wep := &p.weapons[entityID]
+
+				// Clear previous owner
+				if wep.Owner != nil {
+					delete(wep.Owner.RawWeapons, wep.EntityID)
+				}
+
+				// Attribute weapon to player
 				wep.Owner = pl
 				pl.RawWeapons[entityID] = wep
 			} else {
@@ -411,8 +417,10 @@ func (p *Parser) nadeProjectileDestroyed(proj *common.GrenadeProjectile) {
 
 func (p *Parser) bindWeapon(entity *st.Entity, wepType common.EquipmentElement) {
 	entityID := entity.ID()
+	currentOwner := p.weapons[entityID].Owner
 	p.weapons[entityID] = common.NewEquipment(wepType)
 	eq := &p.weapons[entityID]
+	eq.Owner = currentOwner
 	eq.EntityID = entityID
 	eq.AmmoInMagazine = -1
 

game_events.go

@@ -545,9 +545,7 @@ func mapGameEventData(d *msg.CSVCMsg_GameEventListDescriptorT, e *msg.CSVCMsg_Ga
 
 // Returns the players instance of the weapon if applicable or a new instance otherwise.
 func getPlayerWeapon(player *common.Player, wepType common.EquipmentElement) *common.Equipment {
-	class := wepType.Class()
-	isSpecialWeapon := class == common.EqClassGrenade || (class == common.EqClassEquipment && wepType != common.EqKnife)
-	if !isSpecialWeapon && player != nil {
+	if player != nil {
 		for _, wep := range player.Weapons() {
 			if wep.Weapon == wepType {
 				return wep

game_events_test.go

@@ -53,3 +53,36 @@ func TestRoundEnd_LoserState_Score(t *testing.T) {
 
 	assert.Equal(t, 1, eventOccurred)
 }
+
+func TestGetPlayerWeapon_NilPlayer(t *testing.T) {
+	wep := getPlayerWeapon(nil, common.EqAK47)
+
+	assert.NotNil(t, wep)
+	assert.Equal(t, common.EqAK47, wep.Weapon)
+}
+
+func TestGetPlayerWeapon_Found(t *testing.T) {
+	ak := &common.Equipment{Weapon: common.EqAK47}
+	pl := &common.Player{
+		RawWeapons: map[int]*common.Equipment{
+			1: ak,
+		},
+	}
+
+	wep := getPlayerWeapon(pl, common.EqAK47)
+
+	assert.True(t, wep == ak)
+}
+
+func TestGetPlayerWeapon_NotFound(t *testing.T) {
+	ak := &common.Equipment{Weapon: common.EqAK47}
+	pl := &common.Player{
+		RawWeapons: map[int]*common.Equipment{
+			1: ak,
+		},
+	}
+
+	wep := getPlayerWeapon(pl, common.EqM4A1)
+
+	assert.Equal(t, common.EqM4A1, wep.Weapon)
+}