aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/BegGoal.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/BegGoal.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/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 97553928..3f059b66 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() == NULL) return false;
+ if (player.lock() == nullptr) return false;
wolf->setDespawnProtected();
return playerHoldingInteresting(player.lock());
}
bool BegGoal::canContinueToUse()
{
- if (player.lock() == NULL || !player.lock()->isAlive()) return false;
+ if (player.lock() == nullptr || !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 == NULL) return false;
+ if (item == nullptr) return false;
if (!wolf->isTame() && item->id == Item::bone_Id) return true;
return wolf->isFood(item);
} \ No newline at end of file