Merge branch 'smartcmd:main' into main

1 files changed, 3 insertions, 3 deletions

diff --git a/Minecraft.World/BegGoal.cpp b/Minecraft.World/BegGoal.cpp
index 97553928..3f059b66 100644
--- a/Minecraft.World/BegGoal.cpp
+++ b/Minecraft.World/BegGoal.cpp
@@ -20,14 +20,14 @@ BegGoal::BegGoal(Wolf *wolf, float lookDistance)
 bool BegGoal::canUse()
 {
 	player = weak_ptr<Player>(level->getNearestPlayer(wolf->shared_from_this(), lookDistance));
-	if (player.lock() == NULL) return false;
+	if (player.lock() == nullptr) return false;
 	wolf->setDespawnProtected();
 	return playerHoldingInteresting(player.lock());
 }
 
 bool BegGoal::canContinueToUse()
 {
-	if (player.lock() == NULL || !player.lock()->isAlive()) return false;
+	if (player.lock() == nullptr || !player.lock()->isAlive()) return false;
 	if (wolf->distanceToSqr(player.lock()) > lookDistance * lookDistance) return false;
 	wolf->setDespawnProtected();
 	return lookTime > 0 && playerHoldingInteresting(player.lock());
@@ -54,7 +54,7 @@ void BegGoal::tick()
 bool BegGoal::playerHoldingInteresting(shared_ptr<Player> player)
 {
 	shared_ptr<ItemInstance> item = player->inventory->getSelected();
-	if (item == NULL) return false;
+	if (item == nullptr) return false;
 	if (!wolf->isTame() && item->id == Item::bone_Id) return true;
 	return wolf->isFood(item);
 }
\ No newline at end of file