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 a9be52c41a.
This commit is contained in:
@@ -21,14 +21,14 @@ OcelotAttackGoal::OcelotAttackGoal(Mob *mob)
|
||||
bool OcelotAttackGoal::canUse()
|
||||
{
|
||||
shared_ptr<LivingEntity> bestTarget = mob->getTarget();
|
||||
if (bestTarget == nullptr) return false;
|
||||
if (bestTarget == NULL) return false;
|
||||
target = weak_ptr<LivingEntity>(bestTarget);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool OcelotAttackGoal::canContinueToUse()
|
||||
{
|
||||
if (target.lock() == nullptr || !target.lock()->isAlive()) return false;
|
||||
if (target.lock() == NULL || !target.lock()->isAlive()) return false;
|
||||
if (mob->distanceToSqr(target.lock()) > 15 * 15) return false;
|
||||
return !mob->getNavigation()->isDone() || canUse();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user