LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-12 18:29:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: make Tile::getAABB return optional<AABB>

Browse Source
This commit is contained in:
orng
2026-03-28 00:11:19 -05:00
parent 78b5255224
commit 7158fd398f
71 changed files with 205 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Minecraft.World/Blocks/WallTile.cpp
View File

@@ -80,7 +80,7 @@ void WallTile::updateShape(LevelSource* level, int x, int y, int z,
setShape(west, 0, north, east, up, south);
}
AABB* WallTile::getAABB(Level* level, int x, int y, int z) {
std::optional<AABB> WallTile::getAABB(Level* level, int x, int y, int z) {
// 4J-JEV: Changed to avoid race conditions associated with calling update
// shape.
@@ -125,7 +125,7 @@ AABB* WallTile::getAABB(Level* level, int x, int y, int z) {
// south = .5f + WALL_WIDTH;
}
return AABB::newTemp(x + west, y, z + north, x + east, y + 1.5f, z + south);
return AABB(x + west, y, z + north, x + east, y + 1.5f, z + south);
}
bool WallTile::connectsTo(LevelSource* level, int x, int y, int z) {