Merge branch 'smartcmd:main' into main

1 files changed, 5 insertions, 5 deletions

diff --git a/Minecraft.World/DamageSource.cpp b/Minecraft.World/DamageSource.cpp
index 1ed1c65f..bc3adc80 100644
--- a/Minecraft.World/DamageSource.cpp
+++ b/Minecraft.World/DamageSource.cpp
@@ -40,7 +40,7 @@ DamageSource *DamageSource::arrow(shared_ptr<Arrow> arrow, shared_ptr<Entity> ow
 
 DamageSource *DamageSource::fireball(shared_ptr<Fireball> fireball, shared_ptr<Entity> owner)
 {
-	if (owner == NULL)
+	if (owner == nullptr)
 	{
 		return (new IndirectEntityDamageSource(ChatPacket::e_ChatDeathOnFire, ChatPacket::e_ChatDeathOnFire, fireball, fireball))->setIsFire()->setProjectile();
 	}
@@ -64,7 +64,7 @@ DamageSource *DamageSource::thorns(shared_ptr<Entity> source)
 
 DamageSource *DamageSource::explosion(Explosion *explosion)
 {
-	if ( (explosion != NULL) && (explosion->getSourceMob() != NULL) )
+	if ( (explosion != nullptr) && (explosion->getSourceMob() != nullptr) )
 	{
 		return (new EntityDamageSource(ChatPacket::e_ChatDeathExplosionPlayer, ChatPacket::e_ChatDeathExplosionPlayer, explosion->getSourceMob()))->setScalesWithDifficulty()->setExplosion();
 	}
@@ -191,13 +191,13 @@ DamageSource *DamageSource::setMagic()
 shared_ptr<ChatPacket> DamageSource::getDeathMessagePacket(shared_ptr<LivingEntity> player)
 {
 	shared_ptr<LivingEntity> source = player->getKillCredit();
-	if(source != NULL)
+	if(source != nullptr)
 	{
-		return shared_ptr<ChatPacket>( new ChatPacket(player->getNetworkName(), m_msgWithItemId != ChatPacket::e_ChatCustom ? m_msgWithItemId : m_msgId, source->GetType(), source->getNetworkName() ) );
+		return std::make_shared<ChatPacket>(player->getNetworkName(), m_msgWithItemId != ChatPacket::e_ChatCustom ? m_msgWithItemId : m_msgId, source->GetType(), source->getNetworkName());
 	}
 	else
 	{
-		return shared_ptr<ChatPacket>( new ChatPacket(player->getNetworkName(), m_msgId ) );
+		return std::make_shared<ChatPacket>(player->getNetworkName(), m_msgId);
 	}
 }