Project modernization (#630)
* 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
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user