flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Clean up pickup collection to use ForEachEntityInBox

Browse Source
This commit is contained in:
Tiger Wang
2020-08-28 21:35:38 +01:00
parent 167247328a
commit 071aee6c79
3 changed files with 23 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Chunk.cpp
View File

@@ -1496,42 +1496,6 @@ void cChunk::SetAreaBiome(int a_MinRelX, int a_MaxRelX, int a_MinRelZ, int a_Max
void cChunk::CollectPickupsByPlayer(cPlayer & a_Player)
{
auto BoundingBox = a_Player.GetBoundingBox();
BoundingBox.Expand(1, 0.5, 1);
for (auto & Entity : m_Entities)
{
if ((!Entity->IsPickup()) && (!Entity->IsProjectile()))
{
continue; // Only pickups and projectiles can be picked up
}
if (BoundingBox.IsInside(Entity->GetPosition()))
{
/*
LOG("Pickup %d being collected by player \"%s\", distance %f",
(*itr)->GetUniqueID(), a_Player->GetName().c_str(), SqrDist
);
*/
MarkDirty();
if (Entity->IsPickup())
{
static_cast<cPickup &>(*Entity).CollectedBy(a_Player);
}
else
{
static_cast<cProjectileEntity &>(*Entity).CollectedBy(a_Player);
}
}
}
}
bool cChunk::SetSignLines(int a_PosX, int a_PosY, int a_PosZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4)
{
// Also sends update packets to all clients in the chunk