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

Project modernization (#630)

Browse Source 
* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides
This commit is contained in:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 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() != NULL)
if(app.getLevelGenerationOptions() != nullptr)
{
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 + (int) (0.5f + Mth::cos(angle) * 4.0f);
int bz = z + (int) (0.5f + Mth::sin(angle) * 4.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);
placeLeaves(level, bx, bz, branchHeight, 0, random);
for (int b = 0; b < 5; b++)
{
bx = x + (int) (1.5f + Mth::cos(angle) * b);
bz = z + (int) (1.5f + Mth::sin(angle) * b);
bx = x + static_cast<int>(1.5f + Mth::cos(angle) * b);
bz = z + static_cast<int>(1.5f + Mth::sin(angle) * b);
placeBlock(level, bx, branchHeight - 3 + b / 2, bz, Tile::treeTrunk_Id, trunkType);
}