Merge branch 'smartcmd:main' into main

1 files changed, 3 insertions, 3 deletions

diff --git a/Minecraft.World/CommandBlockEntity.cpp b/Minecraft.World/CommandBlockEntity.cpp
index 1c518f4f..00870ee4 100644
--- a/Minecraft.World/CommandBlockEntity.cpp
+++ b/Minecraft.World/CommandBlockEntity.cpp
@@ -32,7 +32,7 @@ int CommandBlockEntity::performCommand(Level *level)
 	}
 
 	MinecraftServer *instance = MinecraftServer::getInstance();
-	if (instance != NULL && instance->isCommandBlockEnabled())
+	if (instance != nullptr && instance->isCommandBlockEnabled())
 	{
 		CommandDispatcher *commandDispatcher = instance->getCommandDispatcher();
 		return commandDispatcher->performCommand(dynamic_pointer_cast<CommandSender>(shared_from_this()), command, byteArray() );
@@ -94,7 +94,7 @@ shared_ptr<Packet> CommandBlockEntity::getUpdatePacket()
 {
 	CompoundTag *tag = new CompoundTag();
 	save(tag);
-	return shared_ptr<TileEntityDataPacket>( new TileEntityDataPacket(x, y, z, TileEntityDataPacket::TYPE_ADV_COMMAND, tag) );
+	return std::make_shared<TileEntityDataPacket>(x, y, z, TileEntityDataPacket::TYPE_ADV_COMMAND, tag);
 }
 
 int CommandBlockEntity::getSuccessCount()
@@ -110,7 +110,7 @@ void CommandBlockEntity::setSuccessCount(int successCount)
 // 4J Added
 shared_ptr<TileEntity> CommandBlockEntity::clone()
 {
-	shared_ptr<CommandBlockEntity> result = shared_ptr<CommandBlockEntity>( new CommandBlockEntity() );
+	shared_ptr<CommandBlockEntity> result = std::make_shared<CommandBlockEntity>();
 	TileEntity::clone(result);
 
 	result->successCount = successCount;