aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/TemptGoal.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.World/TemptGoal.cpp
parenta9be52c41a02d207233199e98898fe7483d7e817 (diff)
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore functionality of the nightly. All in-game menus do not work and generating a world crashes. This reverts commit a9be52c41a02d207233199e98898fe7483d7e817.
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 40b3201c..aebab8fa 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() == nullptr) return false;
+ if (player.lock() == NULL) 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 == nullptr) return false;
+ if (item == NULL) return false;
if (item->id != itemId) return false;
return true;
}
@@ -41,7 +41,7 @@ bool TemptGoal::canContinueToUse()
{
if (canScare)
{
- if(player.lock() == nullptr) return false;
+ if(player.lock() == NULL) return false;
if (mob->distanceToSqr(player.lock()) < 6 * 6)
{
if (player.lock()->distanceToSqr(px, py, pz) > 0.1 * 0.1) return false;