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

Remove AUTO_VAR macro and _toString function (#592)

Browse Source
This commit is contained in:
void_17
2026-03-06 02:11:18 +07:00
committed by GitHub
parent 7d6658fe5b
commit 55231bb8d3
294 changed files with 5067 additions and 5773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Minecraft.World/CombatTracker.cpp
View File

@@ -13,9 +13,9 @@ CombatTracker::CombatTracker(LivingEntity *mob)
CombatTracker::~CombatTracker()
{
for (AUTO_VAR(it,entries.begin()); it != entries.end(); ++it)
for ( auto& it : entries )
{
delete (*it);
delete it;
}
}
@@ -138,9 +138,8 @@ shared_ptr<LivingEntity> CombatTracker::getKiller()
float bestMobDamage = 0;
float bestPlayerDamage = 0;
for (AUTO_VAR(it,entries.begin()); it != entries.end(); ++it)
for ( CombatEntry *entry : entries )
{
CombatEntry *entry = *it;
if ( entry->getSource() != NULL && entry->getSource()->getEntity() != NULL && entry->getSource()->getEntity()->instanceof(eTYPE_PLAYER) && (bestPlayer == NULL || entry->getDamage() > bestPlayerDamage))
{
bestPlayerDamage = entry->getDamage();
@@ -241,9 +240,9 @@ void CombatTracker::recheckStatus()
if (takingDamage && mob->tickCount - lastDamageTime > reset)
{
for (AUTO_VAR(it,entries.begin()); it != entries.end(); ++it)
for ( auto& it : entries )
{
delete (*it);
delete it;
}
entries.clear();
takingDamage = false;