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

Project modernization (#630)

Browse Source 
* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides
This commit is contained in:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 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() == NULL) return false;
if (village.lock() == nullptr) 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 == NULL) return false;
if (mate == nullptr) 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() != NULL && loveMakingTime >= 0 && villageNeedsMoreVillagers() && villager->getAge() == 0;
return partner.lock() != nullptr && 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 == NULL ) return false;
if( _village == nullptr ) return false;
if (!_village->isBreedTimerOk())
{
return false;
}
int idealSize = (int) ((float) _village->getDoorCount() * 0.35);
int idealSize = static_cast<int>((float)_village->getDoorCount() * 0.35);
// System.out.println("idealSize: " + idealSize + " pop: " +
// village.getPopulationSize());
return _village->getPopulationSize() < idealSize;