aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/ScatteredFeaturePieces.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/ScatteredFeaturePieces.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/ScatteredFeaturePieces.cpp')
-rw-r--r--Minecraft.World/ScatteredFeaturePieces.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.World/ScatteredFeaturePieces.cpp b/Minecraft.World/ScatteredFeaturePieces.cpp
index 317d6d9e..07630ef7 100644
--- a/Minecraft.World/ScatteredFeaturePieces.cpp
+++ b/Minecraft.World/ScatteredFeaturePieces.cpp
@@ -35,7 +35,7 @@ ScatteredFeaturePieces::ScatteredFeaturePiece::ScatteredFeaturePiece(Random *ran
orientation = random->nextInt(4);
LevelGenerationOptions *levelGenOptions = app.getLevelGenerationOptions();
- if( levelGenOptions != NULL )
+ if( levelGenOptions != nullptr )
{
int tempOrientation = 0;
if(levelGenOptions->isFeatureChunk(west>>4,north>>4,StructureFeature::eFeature_Temples, &tempOrientation) )
@@ -737,9 +737,9 @@ bool ScatteredFeaturePieces::SwamplandHut::postProcess(Level *level, Random *ran
{
spawnedWitch = true;
- shared_ptr<Witch> witch = shared_ptr<Witch>( new Witch(level) );
+ shared_ptr<Witch> witch = std::make_shared<Witch>(level);
witch->moveTo(wx + .5, wy, wz + .5, 0, 0);
- witch->finalizeMobSpawn(NULL);
+ witch->finalizeMobSpawn(nullptr);
level->addEntity(witch);
}
}