aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/DropperTile.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.World/DropperTile.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.World/DropperTile.cpp')
-rw-r--r--Minecraft.World/DropperTile.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/DropperTile.cpp b/Minecraft.World/DropperTile.cpp
index a28228c9..180aec2a 100644
--- a/Minecraft.World/DropperTile.cpp
+++ b/Minecraft.World/DropperTile.cpp
@@ -27,14 +27,14 @@ DispenseItemBehavior *DropperTile::getDispenseMethod(shared_ptr<ItemInstance> it
shared_ptr<TileEntity> DropperTile::newTileEntity(Level *level)
{
- return shared_ptr<DropperTileEntity>( new DropperTileEntity() );
+ return std::make_shared<DropperTileEntity>();
}
void DropperTile::dispenseFrom(Level *level, int x, int y, int z)
{
BlockSourceImpl source(level, x, y, z);
shared_ptr<DispenserTileEntity> trap = dynamic_pointer_cast<DispenserTileEntity>( source.getEntity() );
- if (trap == NULL) return;
+ if (trap == nullptr) return;
int slot = trap->getRandomSlot();
if (slot < 0)
@@ -48,11 +48,11 @@ void DropperTile::dispenseFrom(Level *level, int x, int y, int z)
shared_ptr<Container> into = HopperTileEntity::getContainerAt(level, x + Facing::STEP_X[face], y + Facing::STEP_Y[face], z + Facing::STEP_Z[face]);
shared_ptr<ItemInstance> remaining = nullptr;
- if (into != NULL)
+ if (into != nullptr)
{
remaining = HopperTileEntity::addItem(into.get(), item->copy()->remove(1), Facing::OPPOSITE_FACING[face]);
- if (remaining == NULL)
+ if (remaining == nullptr)
{
remaining = item->copy();
if (--remaining->count == 0) remaining = nullptr;
@@ -66,7 +66,7 @@ void DropperTile::dispenseFrom(Level *level, int x, int y, int z)
else
{
remaining = DISPENSE_BEHAVIOUR->dispense(&source, item);
- if (remaining != NULL && remaining->count == 0) remaining = nullptr;
+ if (remaining != nullptr && remaining->count == 0) remaining = nullptr;
}
trap->setItem(slot, remaining);