aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/OwnerHurtTargetGoal.cpp
diff options
context:
space:
mode:
authorqwasdrizzel <145519042+qwasdrizzel@users.noreply.github.com>2026-03-16 21:44:26 -0500
committerGitHub <noreply@github.com>2026-03-16 21:44:26 -0500
commitce739f6045ec72127491286ea3f3f21e537c1b55 (patch)
treef33bd42a47c1b4a7b2153a7fb77127ee3b407db9 /Minecraft.World/OwnerHurtTargetGoal.cpp
parent255a18fe8e9b57377975f82e2b227afe2a12eda0 (diff)
parent5a59f5d146b43811dde6a5a0245ee9875d7b5cd1 (diff)
Merge branch 'smartcmd:main' into main
Diffstat (limited to 'Minecraft.World/OwnerHurtTargetGoal.cpp')
-rw-r--r--Minecraft.World/OwnerHurtTargetGoal.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Minecraft.World/OwnerHurtTargetGoal.cpp b/Minecraft.World/OwnerHurtTargetGoal.cpp
index b7e74505..a63e1784 100644
--- a/Minecraft.World/OwnerHurtTargetGoal.cpp
+++ b/Minecraft.World/OwnerHurtTargetGoal.cpp
@@ -14,7 +14,7 @@ bool OwnerHurtTargetGoal::canUse()
{
if (!tameAnimal->isTame()) return false;
shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>( tameAnimal->getOwner() );
- if (owner == NULL) return false;
+ if (owner == nullptr) return false;
ownerLastHurt = weak_ptr<LivingEntity>(owner->getLastHurtMob());
int ts = owner->getLastHurtMobTimestamp();
shared_ptr<LivingEntity> locked = ownerLastHurt.lock();
@@ -26,7 +26,7 @@ void OwnerHurtTargetGoal::start()
mob->setTarget(ownerLastHurt.lock());
shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>( tameAnimal->getOwner() );
- if (owner != NULL)
+ if (owner != nullptr)
{
timestamp = owner->getLastHurtMobTimestamp();