Merge branch 'smartcmd:main' into main

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);