Merge branch 'smartcmd:main' into main

1 files changed, 6 insertions, 6 deletions

diff --git a/Minecraft.World/PlayGoal.cpp b/Minecraft.World/PlayGoal.cpp
index 72ee69d4..6ce3af23 100644
--- a/Minecraft.World/PlayGoal.cpp
+++ b/Minecraft.World/PlayGoal.cpp
@@ -40,22 +40,22 @@ bool PlayGoal::canUse()
 	}
 	delete children;
 
-	if (followFriend.lock() == NULL)
+	if (followFriend.lock() == nullptr)
 	{
 		Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 16, 3);
-		if (pos == NULL) return false;
+		if (pos == nullptr) return false;
 	}
 	return true;
 }
 
 bool PlayGoal::canContinueToUse()
 {
-	return playTime > 0 && followFriend.lock() != NULL;
+	return playTime > 0 && followFriend.lock() != nullptr;
 }
 
 void PlayGoal::start()
 {
-	if (followFriend.lock() != NULL) mob->setChasing(true);
+	if (followFriend.lock() != nullptr) mob->setChasing(true);
 	playTime = 1000;
 }
 
@@ -68,7 +68,7 @@ void PlayGoal::stop()
 void PlayGoal::tick()
 {
 	--playTime;
-	if (followFriend.lock() != NULL)
+	if (followFriend.lock() != nullptr)
 	{
 		if (mob->distanceToSqr(followFriend.lock()) > 2 * 2) mob->getNavigation()->moveTo(followFriend.lock(), speedModifier);
 	}
@@ -77,7 +77,7 @@ void PlayGoal::tick()
 		if (mob->getNavigation()->isDone())
 		{
 			Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 16, 3);
-			if (pos == NULL) return;
+			if (pos == nullptr) return;
 			mob->getNavigation()->moveTo(pos->x, pos->y, pos->z, speedModifier);
 		}
 	}