Fix pass by ref/val problems + inline call

- v wasn't updated, cache[i2] will be
- attributeWeapon func is pretty short and only used once

Author: markus-wa

datatables.go

@@ -267,18 +267,21 @@ func (p *Parser) bindNewPlayer(playerEntity *st.Entity) {
 
 	var cache [maxWeapons]int
 
-	for i, v := range cache {
+	for i := range cache {
 		i2 := i // Copy for passing to handler
 		playerEntity.FindProperty(wepPrefix + fmt.Sprintf("%03d", i)).RegisterPropertyUpdateHandler(func(val st.PropValue) {
 			idx := val.IntVal & indexMask
 			if idx != indexMask {
-				if v != 0 {
+				if cache[i2] != 0 {
 					// Player already has a weapon in this slot.
 					pl.RawWeapons[cache[i2]] = nil
-					cache[i2] = 0
 				}
 				cache[i2] = idx
-				p.attributeWeapon(idx, pl)
+
+				// Attribute weapon to player
+				wep := &p.weapons[idx]
+				wep.Owner = pl
+				pl.RawWeapons[idx] = wep
 			} else {
 				if cache[i2] != 0 && pl.RawWeapons[cache[i2]] != nil {
 					pl.RawWeapons[cache[i2]].Owner = nil
@@ -297,12 +300,6 @@ func (p *Parser) bindNewPlayer(playerEntity *st.Entity) {
 	}
 }
 
-func (p *Parser) attributeWeapon(index int, player *common.Player) {
-	wep := &p.weapons[index]
-	wep.Owner = player
-	player.RawWeapons[index] = wep
-}
-
 func (p *Parser) bindWeapons() {
 	for i := 0; i < maxEntities; i++ {
 		p.weapons[i] = common.NewEquipment("")

sendtables/entity.go

@@ -104,8 +104,9 @@ func readFieldIndex(reader *bit.BitReader, lastIndex int, newWay bool) int {
 // and we can then take the map as baseline for the new entity.
 func (e *Entity) CollectProperties(ppBase *map[int]PropValue) {
 	for i := range e.props {
+		i2 := i // Copy for the adder
 		adder := func(val PropValue) {
-			(*ppBase)[e.props[i].index] = val
+			(*ppBase)[e.props[i2].index] = val
 		}
 
 		e.props[i].RegisterPropertyUpdateHandler(adder)