aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/OcelotAttackGoal.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-07 21:56:03 -0500
committerGitHub <noreply@github.com>2026-03-08 09:56:03 +0700
commita9be52c41a02d207233199e98898fe7483d7e817 (patch)
tree71dfaec3a86b05e9ca409b97d8eb9d7f993bfdd0 /Minecraft.World/OcelotAttackGoal.cpp
parent1be5faaea781402e7de06b263eeca4c688b7712c (diff)
Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
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();
}