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:
@@ -14,9 +14,9 @@ bool RestrictOpenDoorGoal::canUse()
|
||||
{
|
||||
if (mob->level->isDay()) return false;
|
||||
shared_ptr<Village> village = mob->level->villages->getClosestVillage(Mth::floor(mob->x), Mth::floor(mob->y), Mth::floor(mob->z), 16);
|
||||
if (village == nullptr) return false;
|
||||
if (village == NULL) return false;
|
||||
shared_ptr<DoorInfo> _doorInfo = village->getClosestDoorInfo(Mth::floor(mob->x), Mth::floor(mob->y), Mth::floor(mob->z));
|
||||
if (_doorInfo == nullptr) return false;
|
||||
if (_doorInfo == NULL) return false;
|
||||
doorInfo = _doorInfo;
|
||||
return _doorInfo->distanceToInsideSqr(Mth::floor(mob->x), Mth::floor(mob->y), Mth::floor(mob->z)) < 1.5 * 1.5;
|
||||
}
|
||||
@@ -25,7 +25,7 @@ bool RestrictOpenDoorGoal::canContinueToUse()
|
||||
{
|
||||
if (mob->level->isDay()) return false;
|
||||
shared_ptr<DoorInfo> _doorInfo = doorInfo.lock();
|
||||
if ( _doorInfo == nullptr ) return false;
|
||||
if ( _doorInfo == NULL ) return false;
|
||||
return !_doorInfo->removed && _doorInfo->isInsideSide(Mth::floor(mob->x), Mth::floor(mob->z));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user