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

16
Minecraft.World/MeleeAttackGoal.cpp
View File

@@ -19,7 +19,7 @@ void MeleeAttackGoal::_init(PathfinderMob *mob, double speedModifier, bool track
attackTime = 0;
path = nullptr;
path = NULL;
timeToRecalcPath = 0;
}
@@ -36,24 +36,24 @@ MeleeAttackGoal::MeleeAttackGoal(PathfinderMob *mob, double speedModifier, bool
MeleeAttackGoal::~MeleeAttackGoal()
{
if(path != nullptr) delete path;
if(path != NULL) delete path;
}
bool MeleeAttackGoal::canUse()
{
shared_ptr<LivingEntity> target = mob->getTarget();
if (target == nullptr) return false;
if (target == NULL) return false;
if (!target->isAlive()) return false;
if (attackType != eTYPE_NOTSET && !target->instanceof(attackType)) return false;
if (attackType != NULL && !target->instanceof(attackType)) return false;
delete path;
path = mob->getNavigation()->createPath(target);
return path != nullptr;
return path != NULL;
}
bool MeleeAttackGoal::canContinueToUse()
{
shared_ptr<LivingEntity> target = mob->getTarget();
if (target == nullptr) return false;
if (target == NULL) return false;
if (!target->isAlive()) return false;
if (!trackTarget) return !mob->getNavigation()->isDone();
if (!mob->isWithinRestriction(Mth::floor(target->x), Mth::floor(target->y), Mth::floor(target->z))) return false;
@@ -63,7 +63,7 @@ bool MeleeAttackGoal::canContinueToUse()
void MeleeAttackGoal::start()
{
mob->getNavigation()->moveTo(path, speedModifier);
path = nullptr;
path = NULL;
timeToRecalcPath = 0;
}
@@ -91,6 +91,6 @@ void MeleeAttackGoal::tick()
if (mob->distanceToSqr(target->x, target->bb->y0, target->z) > meleeRadiusSqr) return;
if (attackTime > 0) return;
attackTime = 20;
if (mob->getCarriedItem() != nullptr) mob->swing();
if (mob->getCarriedItem() != NULL) mob->swing();
mob->doHurtTarget(target);
}