Merge branch 'smartcmd:main' into main

1 files changed, 3 insertions, 3 deletions

diff --git a/Minecraft.World/MobSpawnerTileEntity.cpp b/Minecraft.World/MobSpawnerTileEntity.cpp
index 013503b6..e3ee57d6 100644
--- a/Minecraft.World/MobSpawnerTileEntity.cpp
+++ b/Minecraft.World/MobSpawnerTileEntity.cpp
@@ -37,7 +37,7 @@ int MobSpawnerTileEntity::TileEntityMobSpawner::getZ()
 void MobSpawnerTileEntity::TileEntityMobSpawner::setNextSpawnData(BaseMobSpawner::SpawnData *nextSpawnData)
 {
 	BaseMobSpawner::setNextSpawnData(nextSpawnData);
-	if (getLevel() != NULL) getLevel()->sendTileUpdated(m_parent->x, m_parent->y, m_parent->z);
+	if (getLevel() != nullptr) getLevel()->sendTileUpdated(m_parent->x, m_parent->y, m_parent->z);
 }
 
 MobSpawnerTileEntity::MobSpawnerTileEntity()
@@ -73,7 +73,7 @@ shared_ptr<Packet> MobSpawnerTileEntity::getUpdatePacket()
 	CompoundTag *tag = new CompoundTag();
 	save(tag);
 	tag->remove(L"SpawnPotentials");
-	return shared_ptr<TileEntityDataPacket>( new TileEntityDataPacket(x, y, z, TileEntityDataPacket::TYPE_MOB_SPAWNER, tag) );
+	return std::make_shared<TileEntityDataPacket>(x, y, z, TileEntityDataPacket::TYPE_MOB_SPAWNER, tag);
 }
 
 bool MobSpawnerTileEntity::triggerEvent(int b0, int b1)
@@ -90,7 +90,7 @@ BaseMobSpawner *MobSpawnerTileEntity::getSpawner()
 // 4J Added
 shared_ptr<TileEntity> MobSpawnerTileEntity::clone()
 {
-	shared_ptr<MobSpawnerTileEntity> result = shared_ptr<MobSpawnerTileEntity>( new MobSpawnerTileEntity() );
+	shared_ptr<MobSpawnerTileEntity> result = std::make_shared<MobSpawnerTileEntity>();
 	TileEntity::clone(result);
 
 	return result;