Merge branch 'smartcmd:main' into main

1 files changed, 7 insertions, 7 deletions

diff --git a/Minecraft.World/BreedGoal.cpp b/Minecraft.World/BreedGoal.cpp
index 1c46fd90..10aa6844 100644
--- a/Minecraft.World/BreedGoal.cpp
+++ b/Minecraft.World/BreedGoal.cpp
@@ -25,12 +25,12 @@ bool BreedGoal::canUse()
 {
 	if (!animal->isInLove()) return false;
 	partner = weak_ptr<Animal>(getFreePartner());
-	return partner.lock() != NULL;
+	return partner.lock() != nullptr;
 }
 
 bool BreedGoal::canContinueToUse()
 {
-	return partner.lock() != NULL && partner.lock()->isAlive() && partner.lock()->isInLove() && loveTime < 20 * 3;
+	return partner.lock() != nullptr && partner.lock()->isAlive() && partner.lock()->isInLove() && loveTime < 20 * 3;
 }
 
 void BreedGoal::stop()
@@ -74,21 +74,21 @@ void BreedGoal::breed()
 	shared_ptr<AgableMob> offspring = animal->getBreedOffspring(partner.lock());
 	animal->setDespawnProtected();
 	partner.lock()->setDespawnProtected();
-	if (offspring == NULL)
+	if (offspring == nullptr)
 	{
-		// This will be NULL if we've hit our limits for spawning any particular type of animal... reset things as normally as we can, without actually producing any offspring
+		// This will be nullptr if we've hit our limits for spawning any particular type of animal... reset things as normally as we can, without actually producing any offspring
 		animal->resetLove();
 		partner.lock()->resetLove();
 		return;
 	}
 
 	shared_ptr<Player> loveCause = animal->getLoveCause();
-	if (loveCause == NULL && partner.lock()->getLoveCause() != NULL)
+	if (loveCause == nullptr && partner.lock()->getLoveCause() != nullptr)
 	{
 		loveCause = partner.lock()->getLoveCause();
 	}
 
-	if (loveCause != NULL)
+	if (loveCause != nullptr)
 	{
 		// Record mob bred stat.
 		loveCause->awardStat(GenericStats::breedEntity(offspring->GetType()),GenericStats::param_breedEntity(offspring->GetType()));
@@ -118,5 +118,5 @@ void BreedGoal::breed()
 			* animal->bbWidth * 2 - animal->bbWidth, xa, ya, za);
 	}
 	// 4J-PB - Fix for 106869- Customer Encountered: TU12: Content: Gameplay: Breeding animals does not give any Experience Orbs.
-	level->addEntity( shared_ptr<ExperienceOrb>( new ExperienceOrb(level, animal->x, animal->y, animal->z, random->nextInt(7) + 1) ) );
+	level->addEntity(std::make_shared<ExperienceOrb>(level, animal->x, animal->y, animal->z, random->nextInt(7) + 1));
 }