LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-09-28 06:51:05 +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
Minecraft.World/Items/TileItems/StoneSlabTileItem.cpp
+6 -3
View File
@@ -6,6 +6,7 @@
#include "../../Headers/net.minecraft.world.level.tile.h"
#include "../../Headers/net.minecraft.h"
#include "StoneSlabTileItem.h"
#include "../../Util/AABB.h"
StoneSlabTileItem::StoneSlabTileItem(int id, HalfSlabTile* halfTile,
HalfSlabTile* fullTile, bool full)
@@ -55,7 +56,8 @@ bool StoneSlabTileItem::useOn(std::shared_ptr<ItemInstance> instance,
return true;
}
if (level->isUnobstructed(fullTile->getAABB(level, x, y, z)) &&
auto tile_bb = fullTile->getAABB(level, x, y, z);
if (level->isUnobstructed(tile_bb.has_value() ? &*tile_bb : nullptr) &&
level->setTileAndData(x, y, z, fullTile->id, slabType,
Tile::UPDATE_ALL)) {
level->playSound(x + 0.5f, y + 0.5f, z + 0.5f,
@@ -127,7 +129,8 @@ bool StoneSlabTileItem::tryConvertTargetTile(
if (bTestUseOnOnly) {
return true;
}
if (level->isUnobstructed(fullTile->getAABB(level, x, y, z)) &&
auto tile_bb = fullTile->getAABB(level, x, y, z);
if (level->isUnobstructed(tile_bb.has_value() ? &*tile_bb : nullptr) &&
level->setTileAndData(x, y, z, fullTile->id, slabType,
Tile::UPDATE_ALL)) {
level->playSound(x + 0.5f, y + 0.5f, z + 0.5f,
@@ -140,4 +143,4 @@ bool StoneSlabTileItem::tryConvertTargetTile(
}
return false;
}
}