aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/PistonPieceEntity.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/PistonPieceEntity.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/PistonPieceEntity.cpp')
-rw-r--r--Minecraft.World/PistonPieceEntity.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.World/PistonPieceEntity.cpp b/Minecraft.World/PistonPieceEntity.cpp
index a915c2ff..08e18cbb 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 != NULL)
+ if (aabb != nullptr)
{
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 != NULL)
+ if (progressO < 1 && level != nullptr)
{
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 = shared_ptr<PistonPieceEntity>( new PistonPieceEntity() );
+ shared_ptr<PistonPieceEntity> result = std::make_shared<PistonPieceEntity>();
TileEntity::clone(result);
result->id = id;