Merge branch 'smartcmd:main' into main

1 files changed, 2 insertions, 2 deletions

diff --git a/Minecraft.World/BeaconTile.cpp b/Minecraft.World/BeaconTile.cpp
index f002cbe2..04b17d11 100644
--- a/Minecraft.World/BeaconTile.cpp
+++ b/Minecraft.World/BeaconTile.cpp
@@ -11,7 +11,7 @@ BeaconTile::BeaconTile(int id) : BaseEntityTile(id, Material::glass, isSolidRend
 
 shared_ptr<TileEntity> BeaconTile::newTileEntity(Level *level)
 {
-	return shared_ptr<BeaconTileEntity>( new BeaconTileEntity() );
+	return std::make_shared<BeaconTileEntity>();
 }
 
 bool BeaconTile::use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly)
@@ -19,7 +19,7 @@ bool BeaconTile::use(Level *level, int x, int y, int z, shared_ptr<Player> playe
 	if (level->isClientSide) return true;
 
 	shared_ptr<BeaconTileEntity> beacon = dynamic_pointer_cast<BeaconTileEntity>( level->getTileEntity(x, y, z) );
-	if (beacon != NULL) player->openBeacon(beacon);
+	if (beacon != nullptr) player->openBeacon(beacon);
 
 	return true;
 }