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

14
Minecraft.World/TargetGoal.cpp
View File

@@ -34,7 +34,7 @@ TargetGoal::TargetGoal(PathfinderMob *mob, bool mustSee, bool mustReach)
bool TargetGoal::canContinueToUse()
{
shared_ptr<LivingEntity> target = mob->getTarget();
if (target == NULL) return false;
if (target == nullptr) return false;
if (!target->isAlive()) return false;
double within = getFollowDistance();
@@ -56,7 +56,7 @@ bool TargetGoal::canContinueToUse()
double TargetGoal::getFollowDistance()
{
AttributeInstance *followRange = mob->getAttribute(SharedMonsterAttributes::FOLLOW_RANGE);
return followRange == NULL ? 16 : followRange->getValue();
return followRange == nullptr ? 16 : followRange->getValue();
}
void TargetGoal::start()
@@ -73,16 +73,16 @@ void TargetGoal::stop()
bool TargetGoal::canAttack(shared_ptr<LivingEntity> target, bool allowInvulnerable)
{
if (target == NULL) return false;
if (target == nullptr) return false;
if (target == mob->shared_from_this()) return false;
if (!target->isAlive()) return false;
if (!mob->canAttackType(target->GetType())) return false;
OwnableEntity *ownableMob = dynamic_cast<OwnableEntity *>(mob);
if (ownableMob != NULL && !ownableMob->getOwnerUUID().empty())
if (ownableMob != nullptr && !ownableMob->getOwnerUUID().empty())
{
shared_ptr<OwnableEntity> ownableTarget = dynamic_pointer_cast<OwnableEntity>(target);
if (ownableTarget != NULL && ownableMob->getOwnerUUID().compare(ownableTarget->getOwnerUUID()) == 0)
if (ownableTarget != nullptr && ownableMob->getOwnerUUID().compare(ownableTarget->getOwnerUUID()) == 0)
{
// We're attacking something owned by the same person...
return false;
@@ -117,9 +117,9 @@ bool TargetGoal::canReach(shared_ptr<LivingEntity> target)
{
reachCacheTime = 10 + mob->getRandom()->nextInt(5);
Path *path = mob->getNavigation()->createPath(target);
if (path == NULL) return false;
if (path == nullptr) return false;
Node *last = path->last();
if (last == NULL)
if (last == nullptr)
{
delete path;
return false;