From cb0d3521568cc53f98dc394f91bab3148ced5551 Mon Sep 17 00:00:00 2001 From: "Matt.T" <49764813+Matt-T-123@users.noreply.github.com> Date: Thu, 12 Mar 2026 07:09:20 +0000 Subject: [PATCH] SubEntity hitbox fix. All enderdragon hitboxes are now hittable. (They were overwriting e var within the for loop...) --- Minecraft.World/LevelChunk.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Minecraft.World/LevelChunk.cpp b/Minecraft.World/LevelChunk.cpp index 118dbcdda..29308e294 100644 --- a/Minecraft.World/LevelChunk.cpp +++ b/Minecraft.World/LevelChunk.cpp @@ -1628,18 +1628,18 @@ void LevelChunk::getEntities(shared_ptr except, AABB *bb, vectorbb->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 > *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); } } }