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

12
Minecraft.World/PlayGoal.cpp
View File

@@ -40,22 +40,22 @@ bool PlayGoal::canUse()
}
delete children;
if (followFriend.lock() == NULL)
if (followFriend.lock() == nullptr)
{
Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 16, 3);
if (pos == NULL) return false;
if (pos == nullptr) return false;
}
return true;
}
bool PlayGoal::canContinueToUse()
{
return playTime > 0 && followFriend.lock() != NULL;
return playTime > 0 && followFriend.lock() != nullptr;
}
void PlayGoal::start()
{
if (followFriend.lock() != NULL) mob->setChasing(true);
if (followFriend.lock() != nullptr) mob->setChasing(true);
playTime = 1000;
}
@@ -68,7 +68,7 @@ void PlayGoal::stop()
void PlayGoal::tick()
{
--playTime;
if (followFriend.lock() != NULL)
if (followFriend.lock() != nullptr)
{
if (mob->distanceToSqr(followFriend.lock()) > 2 * 2) mob->getNavigation()->moveTo(followFriend.lock(), speedModifier);
}
@@ -77,7 +77,7 @@ void PlayGoal::tick()
if (mob->getNavigation()->isDone())
{
Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 16, 3);
if (pos == NULL) return;
if (pos == nullptr) return;
mob->getNavigation()->moveTo(pos->x, pos->y, pos->z, speedModifier);
}
}