fix: merge conflicts

This commit is contained in:
Fireblade
2026-05-24 23:20:13 -04:00
parent 8676650294
commit cc424e1fad
6 changed files with 7 additions and 8 deletions
+2 -2
View File
@@ -121,8 +121,8 @@ void GrassTile::tick(Level *level, int x, int y, int z, Random *random)
}
}
Material* above = level->getMaterial(x, y + 1, z);
if (above->isSolid() || above->isLiquid()) level->setTileAndUpdate(x, y, z, Tile::dirt_Id);
Material* above = level->getMaterial(x, y + 1, z);
if (level->isSolidBlockingTile(x, y + 1, z) || above->isLiquid()) level->setTileAndUpdate(x, y, z, Tile::dirt_Id);
}
int GrassTile::getResource(int data, Random *random, int playerBonusLevel)