aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/PortalTile.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/PortalTile.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/PortalTile.cpp')
-rw-r--r--Minecraft.World/PortalTile.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.World/PortalTile.cpp b/Minecraft.World/PortalTile.cpp
index 5e891e53..5e664e65 100644
--- a/Minecraft.World/PortalTile.cpp
+++ b/Minecraft.World/PortalTile.cpp
@@ -28,7 +28,7 @@ void PortalTile::tick(Level *level, int x, int y, int z, Random *random)
// spawn a pig man here
int iResult = 0;
shared_ptr<Entity> entity = SpawnEggItem::spawnMobAt(level, 57, x + .5, y0 + 1.1, z + .5, &iResult);
- if (entity != NULL)
+ if (entity != nullptr)
{
entity->changingDimensionDelay = entity->getDimensionChangingDelay();
}
@@ -38,7 +38,7 @@ void PortalTile::tick(Level *level, int x, int y, int z, Random *random)
AABB *PortalTile::getAABB(Level *level, int x, int y, int z)
{
- return NULL;
+ return nullptr;
}
void PortalTile::updateShape(LevelSource *level, int x, int y, int z, int forceData, shared_ptr<TileEntity> forceEntity) // 4J added forceData, forceEntity param
@@ -201,7 +201,7 @@ void PortalTile::entityInside(Level *level, int x, int y, int z, shared_ptr<Enti
{
if (entity->GetType() == eTYPE_EXPERIENCEORB ) return; // 4J added
- if (entity->riding == NULL && entity->rider.lock() == NULL) entity->handleInsidePortal();
+ if (entity->riding == nullptr && entity->rider.lock() == nullptr) entity->handleInsidePortal();
}
void PortalTile::animateTick(Level *level, int xt, int yt, int zt, Random *random)