aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/CommandBlockEntity.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.World/CommandBlockEntity.cpp
parenta9be52c41a02d207233199e98898fe7483d7e817 (diff)
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore functionality of the nightly. All in-game menus do not work and generating a world crashes. This reverts commit a9be52c41a02d207233199e98898fe7483d7e817.
Diffstat (limited to 'Minecraft.World/CommandBlockEntity.cpp')
-rw-r--r--Minecraft.World/CommandBlockEntity.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.World/CommandBlockEntity.cpp b/Minecraft.World/CommandBlockEntity.cpp
index 00870ee4..1c518f4f 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 != nullptr && instance->isCommandBlockEnabled())
+ if (instance != NULL && 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 std::make_shared<TileEntityDataPacket>(x, y, z, TileEntityDataPacket::TYPE_ADV_COMMAND, tag);
+ return shared_ptr<TileEntityDataPacket>( new 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 = std::make_shared<CommandBlockEntity>();
+ shared_ptr<CommandBlockEntity> result = shared_ptr<CommandBlockEntity>( new CommandBlockEntity() );
TileEntity::clone(result);
result->successCount = successCount;