aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/OcelotAttackGoal.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/OcelotAttackGoal.cpp
parent255a18fe8e9b57377975f82e2b227afe2a12eda0 (diff)
parent5a59f5d146b43811dde6a5a0245ee9875d7b5cd1 (diff)
Merge branch 'smartcmd:main' into main
Diffstat (limited to 'Minecraft.World/OcelotAttackGoal.cpp')
-rw-r--r--Minecraft.World/OcelotAttackGoal.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Minecraft.World/OcelotAttackGoal.cpp b/Minecraft.World/OcelotAttackGoal.cpp
index d9e0f29b..9871de2f 100644
--- a/Minecraft.World/OcelotAttackGoal.cpp
+++ b/Minecraft.World/OcelotAttackGoal.cpp
@@ -21,14 +21,14 @@ OcelotAttackGoal::OcelotAttackGoal(Mob *mob)
bool OcelotAttackGoal::canUse()
{
shared_ptr<LivingEntity> bestTarget = mob->getTarget();
- if (bestTarget == NULL) return false;
+ if (bestTarget == nullptr) return false;
target = weak_ptr<LivingEntity>(bestTarget);
return true;
}
bool OcelotAttackGoal::canContinueToUse()
{
- if (target.lock() == NULL || !target.lock()->isAlive()) return false;
+ if (target.lock() == nullptr || !target.lock()->isAlive()) return false;
if (mob->distanceToSqr(target.lock()) > 15 * 15) return false;
return !mob->getNavigation()->isDone() || canUse();
}