TestUser/MinecraftConsoles
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SubEntity hitbox hit detection (#1175)

Browse Source
This commit is contained in:
Matt.T
2026-03-12 12:32:27 +00:00
committed by GitHub
parent bb8ffee0d3
commit e689562027
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.World/LevelChunk.cpp
View File

@@ -1628,18 +1628,18 @@ void LevelChunk::getEntities(shared_ptr<Entity> except, AABB *bb, vector<shared_
for (auto& e : *entities) for (auto& e : *entities)
{ {
if ( e && e != except && e->bb->intersects(bb) && (selector == nullptr || selector->matches(e))) if (e && e != except && e->bb->intersects(bb) && (selector == nullptr || selector->matches(e)))
{ {
es.push_back(e); es.push_back(e);
vector<shared_ptr<Entity> > *subs = e->getSubEntities(); vector<shared_ptr<Entity> > *subs = e->getSubEntities();
if (subs != nullptr) if (subs != nullptr)
{ {
for (const auto& sub : *subs) for (const auto& subEntity : *subs)
{ {
e = sub; if (subEntity && subEntity != except && subEntity->bb->intersects(bb) && (selector == nullptr || selector->matches(subEntity)))
if ( e && e != except && e->bb->intersects(bb) && (selector == nullptr || selector->matches(e)))
{ {
es.push_back(e); es.push_back(subEntity);
} }
} }
} }