diff options
author | Masy98 <masy@antheruscraft.de> | 2014-09-06 22:06:40 +0200 |
---|---|---|
committer | Masy98 <masy@antheruscraft.de> | 2014-09-06 22:06:40 +0200 |
commit | 9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa (patch) | |
tree | 500cd7ff84cbf42e34eb95225e83c3f18c4258c0 /src/Entities/Pickup.cpp | |
parent | Fixed typo! (diff) | |
parent | Merge remote-tracking branch 'upstream/master' (diff) | |
download | cuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.tar cuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.tar.gz cuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.tar.bz2 cuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.tar.lz cuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.tar.xz cuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.tar.zst cuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.zip |
Diffstat (limited to 'src/Entities/Pickup.cpp')
-rw-r--r-- | src/Entities/Pickup.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Entities/Pickup.cpp b/src/Entities/Pickup.cpp index aab534f41..87b5bed07 100644 --- a/src/Entities/Pickup.cpp +++ b/src/Entities/Pickup.cpp @@ -150,10 +150,14 @@ void cPickup::Tick(float a_Dt, cChunk & a_Chunk) } } - if (!IsDestroyed() && (m_Item.m_ItemCount < m_Item.GetMaxStackSize())) // Don't combine into an already full pickup + // Try to combine the pickup with adjacent same-item pickups: + if (!IsDestroyed() && (m_Item.m_ItemCount < m_Item.GetMaxStackSize())) // Don't combine if already full { + // By using a_Chunk's ForEachEntity() instead of cWorld's, pickups don't combine across chunk boundaries. + // That is a small price to pay for not having to traverse the entire world for each entity. + // The speedup in the tick thread is quite considerable. cPickupCombiningCallback PickupCombiningCallback(GetPosition(), this); - m_World->ForEachEntity(PickupCombiningCallback); // Not ForEachEntityInChunk, otherwise pickups don't combine across chunk boundaries + a_Chunk.ForEachEntity(PickupCombiningCallback); if (PickupCombiningCallback.FoundMatchingPickup()) { m_World->BroadcastEntityMetadata(*this); |