backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-25 16:12:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #331 from MatthewBeshay/fix/pr329-aabb-followup

Browse source 
fix: restore ghast reach checks and fire collision bounds after AABB refactor
This commit is contained in:
Tropical 2026-03-28 04:46:27 -05:00 committed by GitHub
parent 8cbdb636aa c12f32f637
commit 38ba5e144d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Minecraft.World/Entities/Entity.cpp
View file

@ -885,8 +885,8 @@ void Entity::move(double xa, double ya, double za,
checkInsideTiles();
bool water = isInWaterOrRain();
const AABB& shrunk = bb.shrink(0.001, 0.001, 0.001);
if (level->containsFireTile(&bb)) {
AABB shrunk = bb.shrink(0.001, 0.001, 0.001);
if (level->containsFireTile(&shrunk)) {
burn(1);
if (!water) {
onFire++;

5
Minecraft.World/Entities/Mobs/Ghast.cpp
View file

@ -169,10 +169,11 @@ bool Ghast::canReach(double xt, double yt, double zt, double dist) {
double xd = (xTarget - x) / dist;
double yd = (yTarget - y) / dist;
double zd = (zTarget - z) / dist;
AABB probe = bb;
for (int d = 1; d < dist; d++) {
bb.move(xd, yd, zd);
if (!level->getCubes(shared_from_this(), &bb)->empty()) return false;
probe = probe.move(xd, yd, zd);
if (!level->getCubes(shared_from_this(), &probe)->empty()) return false;
}
return true;