aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/PlayGoal.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.World/PlayGoal.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* 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 * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.World/PlayGoal.cpp')
-rw-r--r--Minecraft.World/PlayGoal.cpp12
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);
}
}