aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/TemptGoal.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/TemptGoal.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/TemptGoal.cpp')
-rw-r--r--Minecraft.World/TemptGoal.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.World/TemptGoal.cpp b/Minecraft.World/TemptGoal.cpp
index aebab8fa..40b3201c 100644
--- a/Minecraft.World/TemptGoal.cpp
+++ b/Minecraft.World/TemptGoal.cpp
@@ -29,10 +29,10 @@ bool TemptGoal::canUse()
return false;
}
player = weak_ptr<Player>(mob->level->getNearestPlayer(mob->shared_from_this(), 10));
- if (player.lock() == NULL) return false;
+ if (player.lock() == nullptr) return false;
mob->setDespawnProtected(); // If we've got a nearby player, then consider this mob as something we'd miss if it despawned
shared_ptr<ItemInstance> item = player.lock()->getSelectedItem();
- if (item == NULL) return false;
+ if (item == nullptr) return false;
if (item->id != itemId) return false;
return true;
}
@@ -41,7 +41,7 @@ bool TemptGoal::canContinueToUse()
{
if (canScare)
{
- if(player.lock() == NULL) return false;
+ if(player.lock() == nullptr) return false;
if (mob->distanceToSqr(player.lock()) < 6 * 6)
{
if (player.lock()->distanceToSqr(px, py, pz) > 0.1 * 0.1) return false;