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

Add cEntity::GetBoundingBox, and use where appropriate. (#4711)

Browse Source 
* Add cEntity::GetBoundingBox, and use where appropriate.
This commit is contained in:
Alexander Harkness
2020-05-03 20:04:33 +00:00
committed by GitHub
parent 5b92e6654f
commit 994036a3b8
9 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Chunk.cpp
View File

@@ -1625,7 +1625,7 @@ void cChunk::SetAreaBiome(int a_MinRelX, int a_MaxRelX, int a_MinRelZ, int a_Max
void cChunk::CollectPickupsByPlayer(cPlayer & a_Player)
{
auto BoundingBox = cBoundingBox(a_Player.GetPosition(), a_Player.GetWidth(), a_Player.GetHeight());
auto BoundingBox = a_Player.GetBoundingBox();
BoundingBox.Expand(1, 0.5, 1);
for (auto & Entity : m_Entities)
@@ -1876,8 +1876,7 @@ bool cChunk::ForEachEntityInBox(const cBoundingBox & a_Box, cEntityCallback a_Ca
{
continue;
}
cBoundingBox EntBox(Entity->GetPosition(), Entity->GetWidth() / 2, Entity->GetHeight());
if (!EntBox.DoesIntersect(a_Box))
if (!Entity->GetBoundingBox().DoesIntersect(a_Box))
{
// The entity is not in the specified box
continue;