strictly remove arrow if it has been picked up

server/entity/item_behaviour.go

@@ -132,6 +132,9 @@ func (i *ItemBehaviour) merge(e *Ent, other *Ent) bool {
 
 // collect makes a collector collect the item (or at least part of it).
 func (i *ItemBehaviour) collect(e *Ent, collector Collector) {
+	if !collector.CanCollect() {
+		return
+	}
 	w, pos := e.World(), e.Position()
 	n := collector.Collect(i.i)
 	if n == 0 {
@@ -156,6 +159,8 @@ func (i *ItemBehaviour) collect(e *Ent, collector Collector) {
 // a player or a zombie.
 type Collector interface {
 	world.Entity
+	// CanCollect returns whether the Collector is able to pick up an item or not.
+	CanCollect() bool
 	// Collect collects the stack passed. It is called if the Collector is standing near an item entity that
 	// may be picked up.
 	// The count of items collected from the stack n is returned.

server/entity/projectile.go

@@ -221,6 +221,11 @@ func (lt *ProjectileBehaviour) tryPickup(e *Ent) {
 		if !ok {
 			continue
 		}
+
+		if !collector.CanCollect() {
+			continue
+		}
+
 		// A collector was within range to pick up the entity.
 		lt.close = true
 		for _, viewer := range w.Viewers(e.pos) {
@@ -229,6 +234,7 @@ func (lt *ProjectileBehaviour) tryPickup(e *Ent) {
 		if lt.conf.PickupItem.Empty() {
 			return
 		}
+
 		_ = collector.Collect(lt.conf.PickupItem)
 	}
 }

server/player/player.go

@@ -2046,13 +2046,22 @@ func (p *Player) Rotation() cube.Rotation {
 	return cube.Rotation{p.yaw.Load(), p.pitch.Load()}
 }
 
-// Collect makes the player collect the item stack passed, adding it to the inventory. The amount of items that could
-// be added is returned.
-func (p *Player) Collect(s item.Stack) int {
+// CanCollect returns whether the player is able to pick up an item stack or not.
+func (p *Player) CanCollect() bool {
 	if p.Dead() {
-		return 0
+		return false
 	}
 	if !p.GameMode().AllowsInteraction() {
+		return false
+	}
+
+	return true
+}
+
+// Collect makes the player collect the item stack passed, adding it to the inventory. The amount of items that could
+// be added is returned.
+func (p *Player) Collect(s item.Stack) int {
+	if !p.CanCollect() {
 		return 0
 	}
 	ctx := event.C()