aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/BegGoal.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/BegGoal.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/BegGoal.cpp')
-rw-r--r--Minecraft.World/BegGoal.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.World/BegGoal.cpp b/Minecraft.World/BegGoal.cpp
index 3f059b66..97553928 100644
--- a/Minecraft.World/BegGoal.cpp
+++ b/Minecraft.World/BegGoal.cpp
@@ -20,14 +20,14 @@ BegGoal::BegGoal(Wolf *wolf, float lookDistance)
bool BegGoal::canUse()
{
player = weak_ptr<Player>(level->getNearestPlayer(wolf->shared_from_this(), lookDistance));
- if (player.lock() == nullptr) return false;
+ if (player.lock() == NULL) return false;
wolf->setDespawnProtected();
return playerHoldingInteresting(player.lock());
}
bool BegGoal::canContinueToUse()
{
- if (player.lock() == nullptr || !player.lock()->isAlive()) return false;
+ if (player.lock() == NULL || !player.lock()->isAlive()) return false;
if (wolf->distanceToSqr(player.lock()) > lookDistance * lookDistance) return false;
wolf->setDespawnProtected();
return lookTime > 0 && playerHoldingInteresting(player.lock());
@@ -54,7 +54,7 @@ void BegGoal::tick()
bool BegGoal::playerHoldingInteresting(shared_ptr<Player> player)
{
shared_ptr<ItemInstance> item = player->inventory->getSelected();
- if (item == nullptr) return false;
+ if (item == NULL) return false;
if (!wolf->isTame() && item->id == Item::bone_Id) return true;
return wolf->isFood(item);
} \ No newline at end of file