aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/ScatteredFeaturePieces.cpp
diff options
context:
space:
mode:
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);
}
}