aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/AvoidPlayerGoal.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/AvoidPlayerGoal.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/AvoidPlayerGoal.cpp')
-rw-r--r--Minecraft.World/AvoidPlayerGoal.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Minecraft.World/AvoidPlayerGoal.cpp b/Minecraft.World/AvoidPlayerGoal.cpp
index f9c6641a..53aebe89 100644
--- a/Minecraft.World/AvoidPlayerGoal.cpp
+++ b/Minecraft.World/AvoidPlayerGoal.cpp
@@ -33,12 +33,12 @@ AvoidPlayerGoal::AvoidPlayerGoal(PathfinderMob *mob, const type_info& avoidType,
entitySelector = new AvoidPlayerGoalEntitySelector(this);
toAvoid = weak_ptr<Entity>();
- path = nullptr;
+ path = NULL;
}
AvoidPlayerGoal::~AvoidPlayerGoal()
{
- if(path != nullptr) delete path;
+ if(path != NULL) delete path;
delete entitySelector;
}
@@ -47,9 +47,9 @@ bool AvoidPlayerGoal::canUse()
if (avoidType == typeid(Player))
{
shared_ptr<TamableAnimal> tamableAnimal = dynamic_pointer_cast<TamableAnimal>(mob->shared_from_this());
- if (tamableAnimal != nullptr && tamableAnimal->isTame()) return false;
+ if (tamableAnimal != NULL && tamableAnimal->isTame()) return false;
toAvoid = weak_ptr<Entity>(mob->level->getNearestPlayer(mob->shared_from_this(), maxDist));
- if (toAvoid.lock() == nullptr) return false;
+ if (toAvoid.lock() == NULL) return false;
}
else
{
@@ -64,24 +64,24 @@ bool AvoidPlayerGoal::canUse()
}
Vec3 *pos = RandomPos::getPosAvoid(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 16, 7, Vec3::newTemp(toAvoid.lock()->x, toAvoid.lock()->y, toAvoid.lock()->z));
- if (pos == nullptr) return false;
+ if (pos == NULL) return false;
if (toAvoid.lock()->distanceToSqr(pos->x, pos->y, pos->z) < toAvoid.lock()->distanceToSqr(mob->shared_from_this())) return false;
delete path;
path = pathNav->createPath(pos->x, pos->y, pos->z);
- if (path == nullptr) return false;
+ if (path == NULL) return false;
if (!path->endsInXZ(pos)) return false;
return true;
}
bool AvoidPlayerGoal::canContinueToUse()
{
- return toAvoid.lock() != nullptr && !pathNav->isDone();
+ return toAvoid.lock() != NULL && !pathNav->isDone();
}
void AvoidPlayerGoal::start()
{
pathNav->moveTo(path, walkSpeedModifier);
- path = nullptr;
+ path = NULL;
}
void AvoidPlayerGoal::stop()