Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
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:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.World/MakeLoveGoal.cpp
View File

@@ -26,11 +26,11 @@ bool MakeLoveGoal::canUse()
if (villager->getRandom()->nextInt(500) != 0) return false;
village = level->villages->getClosestVillage(Mth::floor(villager->x), Mth::floor(villager->y), Mth::floor(villager->z), 0);
if (village.lock() == nullptr) return false;
if (village.lock() == NULL) return false;
if (!villageNeedsMoreVillagers()) return false;
shared_ptr<Entity> mate = level->getClosestEntityOfClass(typeid(Villager), villager->bb->grow(8, 3, 8), villager->shared_from_this());
if (mate == nullptr) return false;
if (mate == NULL) return false;
partner = weak_ptr<Villager>(dynamic_pointer_cast<Villager>(mate));
if (partner.lock()->getAge() != 0) return false;
@@ -53,7 +53,7 @@ void MakeLoveGoal::stop()
bool MakeLoveGoal::canContinueToUse()
{
return partner.lock() != nullptr && loveMakingTime >= 0 && villageNeedsMoreVillagers() && villager->getAge() == 0;
return partner.lock() != NULL && loveMakingTime >= 0 && villageNeedsMoreVillagers() && villager->getAge() == 0;
}
void MakeLoveGoal::tick()
@@ -76,14 +76,14 @@ void MakeLoveGoal::tick()
bool MakeLoveGoal::villageNeedsMoreVillagers()
{
shared_ptr<Village> _village = village.lock();
if( _village == nullptr ) return false;
if( _village == NULL ) return false;
if (!_village->isBreedTimerOk())
{
return false;
}
int idealSize = static_cast<int>((float)_village->getDoorCount() * 0.35);
int idealSize = (int) ((float) _village->getDoorCount() * 0.35);
// System.out.println("idealSize: " + idealSize + " pop: " +
// village.getPopulationSize());
return _village->getPopulationSize() < idealSize;