events: remove obsolte ItemPickup.WeaponTraceable() (see #119)

Author: markus-wa

pkg/demoinfocs/events/events.go

@@ -420,42 +420,22 @@ type RankUpdate struct {
 // ItemEquip signals an item was equipped.
 // This event is not available in all demos.
 type ItemEquip struct {
-	Player    *common.Player
-	Weapon    common.Equipment // Value of WeaponPtr, use WeaponPtr instead
-	WeaponPtr *common.Equipment
+	Player *common.Player
+	Weapon *common.Equipment
 }
 
 // ItemPickup signals an item was bought or picked up.
 // This event is not available in all demos.
 type ItemPickup struct {
 	Player *common.Player
-	Weapon common.Equipment // UniqueID() of this cannot be used to trace the weapon, use WeaponTraceable() instead
-}
-
-// WeaponTraceable attempts to return the original Equipment instance.
-// This can be used to trace the same weapon with UniqueID() when it's being dropped to other players.
-//
-// If the original instance cannot be found, the returned Equipment will still have a different UniqueID().
-func (pu ItemPickup) WeaponTraceable() *common.Equipment {
-	if pu.Player == nil {
-		return &pu.Weapon
-	}
-
-	for _, wep := range pu.Player.Inventory {
-		if wep.Type == pu.Weapon.Type {
-			return wep
-		}
-	}
-
-	return &pu.Weapon
+	Weapon *common.Equipment
 }
 
 // ItemDrop signals an item was dropped.
 // This event is not available in all demos.
 type ItemDrop struct {
-	Player    *common.Player
-	Weapon    common.Equipment // Value of WeaponPtr, use WeaponPtr instead
-	WeaponPtr *common.Equipment
+	Player *common.Player
+	Weapon *common.Equipment
 }
 
 // DataTablesParsed signals that the datatables were parsed.

pkg/demoinfocs/events/events_test.go

@@ -8,7 +8,6 @@ import (
 
 	common "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/common"
 	st "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/sendtables"
-	stfake "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/sendtables/fake"
 )
 
 func TestPlayerFlashed_FlashDuration(t *testing.T) {
@@ -44,52 +43,6 @@ func TestBombEvents(t *testing.T) {
 	}
 }
 
-func TestItemPickup_WeaponTraceable_PlayerNil(t *testing.T) {
-	e := ItemPickup{
-		Weapon: common.Equipment{Type: common.EqAK47},
-		Player: nil,
-	}
-
-	assert.Equal(t, e.Weapon, *e.WeaponTraceable())
-}
-
-func TestItemPickup_WeaponTraceable_WeaponFound(t *testing.T) {
-	wep := &common.Equipment{
-		Entity: entity(),
-		Type:   common.EqAK47,
-	}
-	e := ItemPickup{
-		Weapon: common.Equipment{Type: common.EqAK47},
-		Player: &common.Player{Inventory: map[int]*common.Equipment{
-			1: wep,
-		}},
-	}
-
-	assert.Equal(t, wep, e.WeaponTraceable())
-}
-
-func entity() st.Entity {
-	entity := new(stfake.Entity)
-	entity.On("ID").Return(1)
-
-	return entity
-}
-
-func TestItemPickup_WeaponTraceable_WeaponNotFound(t *testing.T) {
-	wep := &common.Equipment{
-		Entity: entity(),
-		Type:   common.EqAK47,
-	}
-	e := ItemPickup{
-		Weapon: common.Equipment{Type: common.EqKnife},
-		Player: &common.Player{Inventory: map[int]*common.Equipment{
-			1: wep,
-		}},
-	}
-
-	assert.Equal(t, e.Weapon, *e.WeaponTraceable())
-}
-
 type demoInfoProviderMock struct {
 }
 
@@ -101,7 +54,7 @@ func (p demoInfoProviderMock) TickRate() float64 {
 	return 128
 }
 
-func (p demoInfoProviderMock) FindPlayerByHandle(handle int) *common.Player {
+func (p demoInfoProviderMock) FindPlayerByHandle(int) *common.Player {
 	return nil
 }
 func (p demoInfoProviderMock) PlayerResourceEntity() st.Entity {

pkg/demoinfocs/game_events.go

@@ -575,26 +575,24 @@ func (geh gameEventHandler) bombBeginDefuse(data map[string]*msg.CSVCMsg_GameEve
 func (geh gameEventHandler) itemEquip(data map[string]*msg.CSVCMsg_GameEventKeyT) {
 	player, weapon := geh.itemEvent(data)
 	geh.dispatch(events.ItemEquip{
-		Player:    player,
-		Weapon:    *weapon,
-		WeaponPtr: weapon,
+		Player: player,
+		Weapon: weapon,
 	})
 }
 
 func (geh gameEventHandler) itemPickup(data map[string]*msg.CSVCMsg_GameEventKeyT) {
 	player, weapon := geh.itemEvent(data)
 	geh.dispatch(events.ItemPickup{
 		Player: player,
-		Weapon: *weapon,
+		Weapon: weapon,
 	})
 }
 
 func (geh gameEventHandler) itemRemove(data map[string]*msg.CSVCMsg_GameEventKeyT) {
 	player, weapon := geh.itemEvent(data)
 	geh.dispatch(events.ItemDrop{
-		Player:    player,
-		Weapon:    *weapon,
-		WeaponPtr: weapon,
+		Player: player,
+		Weapon: weapon,
 	})
 }