aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/OreFeature.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.World/OreFeature.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* 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 * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.World/OreFeature.cpp')
-rw-r--r--Minecraft.World/OreFeature.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.World/OreFeature.cpp b/Minecraft.World/OreFeature.cpp
index c057511b..cea881aa 100644
--- a/Minecraft.World/OreFeature.cpp
+++ b/Minecraft.World/OreFeature.cpp
@@ -35,8 +35,8 @@ bool OreFeature::place(Level *level, Random *random, int x, int y, int z)
bool collisionsExpected = false;
- LevelGenerationOptions *levelGenOptions = NULL;
- if( app.getLevelGenerationOptions() != NULL )
+ LevelGenerationOptions *levelGenOptions = nullptr;
+ if( app.getLevelGenerationOptions() != nullptr )
{
levelGenOptions = app.getLevelGenerationOptions();
@@ -83,7 +83,7 @@ bool OreFeature::place(Level *level, Random *random, int x, int y, int z)
int zt1 = Mth::floor(zz + halfR);
// 4J Stu Added to stop ore features generating areas previously place by game rule generation
- if(collisionsExpected && levelGenOptions != NULL)
+ if(collisionsExpected && levelGenOptions != nullptr)
{
bool intersects = levelGenOptions->checkIntersects(xt0, yt0, zt0, xt1, yt1, zt1);
if(intersects)