diff options
Diffstat (limited to 'Minecraft.World/PistonPieceEntity.cpp')
| -rw-r--r-- | Minecraft.World/PistonPieceEntity.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.World/PistonPieceEntity.cpp b/Minecraft.World/PistonPieceEntity.cpp index 08e18cbb..a915c2ff 100644 --- a/Minecraft.World/PistonPieceEntity.cpp +++ b/Minecraft.World/PistonPieceEntity.cpp @@ -117,7 +117,7 @@ void PistonPieceEntity::moveCollidedEntities(float progress, float amount) } AABB *aabb = Tile::pistonMovingPiece->getAABB(level, x, y, z, id, progress, facing); - if (aabb != nullptr) + if (aabb != NULL) { vector<shared_ptr<Entity> > *entities = level->getEntities(nullptr, aabb); if (!entities->empty()) @@ -140,7 +140,7 @@ void PistonPieceEntity::moveCollidedEntities(float progress, float amount) void PistonPieceEntity::finalTick() { - if (progressO < 1 && level != nullptr) + if (progressO < 1 && level != NULL) { progressO = progress = 1; level->removeTileEntity(x, y, z); @@ -207,7 +207,7 @@ void PistonPieceEntity::save(CompoundTag *tag) // 4J Added shared_ptr<TileEntity> PistonPieceEntity::clone() { - shared_ptr<PistonPieceEntity> result = std::make_shared<PistonPieceEntity>(); + shared_ptr<PistonPieceEntity> result = shared_ptr<PistonPieceEntity>( new PistonPieceEntity() ); TileEntity::clone(result); result->id = id; |