From 55231bb8d3e1a4e2752ac3d444c4287eb0ca4e8b Mon Sep 17 00:00:00 2001 From: void_17 <61356189+void2012@users.noreply.github.com> Date: Fri, 6 Mar 2026 02:11:18 +0700 Subject: Remove AUTO_VAR macro and _toString function (#592) --- Minecraft.World/FallingTile.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'Minecraft.World/FallingTile.cpp') diff --git a/Minecraft.World/FallingTile.cpp b/Minecraft.World/FallingTile.cpp index 28248014..c0eb7d22 100644 --- a/Minecraft.World/FallingTile.cpp +++ b/Minecraft.World/FallingTile.cpp @@ -145,13 +145,15 @@ void FallingTile::tick() CompoundTag *swap = new CompoundTag(); tileEntity->save(swap); vector *allTags = tileData->getAllTags(); - for(AUTO_VAR(it, allTags->begin()); it != allTags->end(); ++it) + if ( allTags ) { - Tag *tag = *it; - if (tag->getName().compare(L"x") == 0 || tag->getName().compare(L"y") == 0 || tag->getName().compare(L"z") == 0) continue; - swap->put(tag->getName(), tag->copy()); + for ( Tag* tag : *allTags ) + { + if (tag->getName().compare(L"x") == 0 || tag->getName().compare(L"y") == 0 || tag->getName().compare(L"z") == 0) continue; + swap->put(tag->getName(), tag->copy()); + } + delete allTags; } - delete allTags; tileEntity->load(swap); tileEntity->setChanged(); } @@ -181,12 +183,14 @@ void FallingTile::causeFallDamage(float distance) // 4J: Copy vector since it might be modified when we hurt the entities (invalidating our iterator) vector > *entities = new vector >(*level->getEntities(shared_from_this(), bb)); DamageSource *source = tile == Tile::anvil_Id ? DamageSource::anvil : DamageSource::fallingBlock; - //for (Entity entity : entities) - for(AUTO_VAR(it, entities->begin()); it != entities->end(); ++it) + if ( source ) { - (*it)->hurt(source, min(Mth::floor(dmg * fallDamageAmount), fallDamageMax)); + for (auto& it : *entities) + { + it->hurt(source, static_cast(std::min(Mth::floor(dmg * fallDamageAmount), fallDamageMax))); + } + delete entities; } - delete entities; if (tile == Tile::anvil_Id && random->nextFloat() < 0.05f + (dmg * 0.05)) { -- cgit v1.2.3