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

10
Minecraft.World/MegaTreeFeature.cpp
View File

@@ -15,7 +15,7 @@ bool MegaTreeFeature::place(Level *level, Random *random, int x, int y, int z)
if (y < 1 || y + treeHeight + 1 > Level::maxBuildHeight) return false;
// 4J Stu Added to stop tree features generating areas previously place by game rule generation
if(app.getLevelGenerationOptions() != nullptr)
if(app.getLevelGenerationOptions() != NULL)
{
PIXBeginNamedEvent(0, "MegaTreeFeature Checking intersects");
LevelGenerationOptions *levelGenOptions = app.getLevelGenerationOptions();
@@ -69,14 +69,14 @@ bool MegaTreeFeature::place(Level *level, Random *random, int x, int y, int z)
while (branchHeight > y + treeHeight / 2)
{
float angle = random->nextFloat() * PI * 2.0f;
int bx = x + static_cast<int>(0.5f + Mth::cos(angle) * 4.0f);
int bz = z + static_cast<int>(0.5f + Mth::sin(angle) * 4.0f);
int bx = x + (int) (0.5f + Mth::cos(angle) * 4.0f);
int bz = z + (int) (0.5f + Mth::sin(angle) * 4.0f);
placeLeaves(level, bx, bz, branchHeight, 0, random);
for (int b = 0; b < 5; b++)
{
bx = x + static_cast<int>(1.5f + Mth::cos(angle) * b);
bz = z + static_cast<int>(1.5f + Mth::sin(angle) * b);
bx = x + (int) (1.5f + Mth::cos(angle) * b);
bz = z + (int) (1.5f + Mth::sin(angle) * b);
placeBlock(level, bx, branchHeight - 3 + b / 2, bz, Tile::treeTrunk_Id, trunkType);
}