aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/FollowOwnerGoal.cpp
diff options
context:
space:
mode:
authorqwasdrizzel <145519042+qwasdrizzel@users.noreply.github.com>2026-03-16 21:44:26 -0500
committerGitHub <noreply@github.com>2026-03-16 21:44:26 -0500
commitce739f6045ec72127491286ea3f3f21e537c1b55 (patch)
treef33bd42a47c1b4a7b2153a7fb77127ee3b407db9 /Minecraft.World/FollowOwnerGoal.cpp
parent255a18fe8e9b57377975f82e2b227afe2a12eda0 (diff)
parent5a59f5d146b43811dde6a5a0245ee9875d7b5cd1 (diff)
Merge branch 'smartcmd:main' into main
Diffstat (limited to 'Minecraft.World/FollowOwnerGoal.cpp')
-rw-r--r--Minecraft.World/FollowOwnerGoal.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Minecraft.World/FollowOwnerGoal.cpp b/Minecraft.World/FollowOwnerGoal.cpp
index 8565d782..89ec4643 100644
--- a/Minecraft.World/FollowOwnerGoal.cpp
+++ b/Minecraft.World/FollowOwnerGoal.cpp
@@ -25,7 +25,7 @@ FollowOwnerGoal::FollowOwnerGoal(TamableAnimal *tamable, double speedModifier, f
bool FollowOwnerGoal::canUse()
{
shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>( tamable->getOwner() );
- if (owner == NULL) return false;
+ if (owner == nullptr) return false;
if (tamable->isSitting()) return false;
if (tamable->distanceToSqr(owner) < startDistance * startDistance) return false;
this->owner = weak_ptr<LivingEntity>(owner);
@@ -34,7 +34,7 @@ bool FollowOwnerGoal::canUse()
bool FollowOwnerGoal::canContinueToUse()
{
- return owner.lock() != NULL && !navigation->isDone() && tamable->distanceToSqr(owner.lock()) > stopDistance * stopDistance && !tamable->isSitting();
+ return owner.lock() != nullptr && !navigation->isDone() && tamable->distanceToSqr(owner.lock()) > stopDistance * stopDistance && !tamable->isSitting();
}
void FollowOwnerGoal::start()