backups/MinecraftConsoles
1
0
Fork 0
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-05-08 23:08:56 +00:00
Code Issues 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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show stats 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)
{
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);
vector<shared_ptr<Entity> > *subs = e->getSubEntities();
if (subs != nullptr)
{
for (const auto& sub : *subs)
for (const auto& subEntity : *subs)
{
e = sub;
if ( e && e != except && e->bb->intersects(bb) && (selector == nullptr || selector->matches(e)))
if (subEntity && subEntity != except && subEntity->bb->intersects(bb) && (selector == nullptr || selector->matches(subEntity)))
{
es.push_back(e);
es.push_back(subEntity);
}
}
}