aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/ReedsFeature.cpp
diff options
context:
space:
mode:
authordaoge <3523206925@qq.com>2026-03-03 03:04:10 +0800
committerGitHub <noreply@github.com>2026-03-03 03:04:10 +0800
commitb3feddfef372618c8a9d7a0abcaf18cfad866c18 (patch)
tree267761c3bb39241ba5c347bfbe2254d06686e287 /Minecraft.World/ReedsFeature.cpp
parent84c31a2331f7a0ec85b9d438992e244f60e5020f (diff)
feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict * feat: TU19 (Dec 2014) Features & Content (#32) * December 2014 files * Working release build * Fix compilation issues * Add sound to Windows64Media * Add DLC content and force Tutorial DLC * Revert "Add DLC content and force Tutorial DLC" This reverts commit 97a43994725008e35fceb984d5549df9c8cea470. * Disable broken light packing * Disable breakpoint during DLC texture map load Allows DLC loading but the DLC textures are still broken * Fix post build not working * ... * fix vs2022 build * fix cmake build --------- Co-authored-by: Loki <lokirautio@gmail.com>
Diffstat (limited to 'Minecraft.World/ReedsFeature.cpp')
-rw-r--r--Minecraft.World/ReedsFeature.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/Minecraft.World/ReedsFeature.cpp b/Minecraft.World/ReedsFeature.cpp
index 6d4f3e97..2792b21b 100644
--- a/Minecraft.World/ReedsFeature.cpp
+++ b/Minecraft.World/ReedsFeature.cpp
@@ -5,11 +5,11 @@
bool ReedsFeature::place(Level *level, Random *random, int x, int y, int z)
{
- for (int i = 0; i < 20; i++)
+ for (int i = 0; i < 20; i++)
{
- int x2 = x + random->nextInt(4) - random->nextInt(4);
- int y2 = y;
- int z2 = z + random->nextInt(4) - random->nextInt(4);
+ int x2 = x + random->nextInt(4) - random->nextInt(4);
+ int y2 = y;
+ int z2 = z + random->nextInt(4) - random->nextInt(4);
// 4J Stu Added to stop reed features generating areas previously place by game rule generation
if(app.getLevelGenerationOptions() != NULL)
@@ -22,25 +22,25 @@ bool ReedsFeature::place(Level *level, Random *random, int x, int y, int z)
continue;
}
}
- if (level->isEmptyTile(x2, y2, z2))
+ if (level->isEmptyTile(x2, y2, z2))
{
- if (level->getMaterial(x2-1, y2-1, z2) == Material::water ||
- level->getMaterial(x2+1, y2-1, z2) == Material::water ||
- level->getMaterial(x2, y2-1, z2-1) == Material::water ||
- level->getMaterial(x2, y2-1, z2+1) == Material::water)
+ if (level->getMaterial(x2-1, y2-1, z2) == Material::water ||
+ level->getMaterial(x2+1, y2-1, z2) == Material::water ||
+ level->getMaterial(x2, y2-1, z2-1) == Material::water ||
+ level->getMaterial(x2, y2-1, z2+1) == Material::water)
{
- int h = 2 + random->nextInt(random->nextInt(3) + 1);
- for (int yy = 0; yy < h; yy++)
+ int h = 2 + random->nextInt(random->nextInt(3) + 1);
+ for (int yy = 0; yy < h; yy++)
{
- if ( Tile::reeds->canSurvive(level, x2, y2 + yy, z2) )
+ if ( Tile::reeds->canSurvive(level, x2, y2 + yy, z2) )
{
- level->setTileNoUpdate(x2, y2 + yy, z2, Tile::reeds_Id);
- }
- }
- }
- }
- }
+ level->setTileAndData(x2, y2 + yy, z2, Tile::reeds_Id, 0, Tile::UPDATE_CLIENTS);
+ }
+ }
+ }
+ }
+ }
- return true;
+ return true;
} \ No newline at end of file