Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

strictly remove arrow if it has been picked up #879

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

strictly remove arrow if it has been picked up #879

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
630d4b3
strictly remove arrow if it has been picked up
UnknownOre May 26, 2024
f7b8a8c
format
UnknownOre May 26, 2024
88f2388
Add CanCollect to the Collector interface
UnknownOre May 29, 2024
6c2a10d
document new functions
UnknownOre May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion server/entity/projectile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,11 @@ func (lt *ProjectileBehaviour) tryPickup(e *Ent) {
if !ok {
continue
}

if collector.Collect(lt.conf.PickupItem) == 0 {
UnknownOre marked this conversation as resolved.
Show resolved Hide resolved
continue
}

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

Expand Down
Loading