Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Minecraft.World/PortalTile.cpp
View File

@@ -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 != nullptr)
if (entity != NULL)
{
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 nullptr;
return NULL;
}
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 == nullptr && entity->rider.lock() == nullptr) entity->handleInsidePortal();
if (entity->riding == NULL && entity->rider.lock() == NULL) entity->handleInsidePortal();
}
void PortalTile::animateTick(Level *level, int xt, int yt, int zt, Random *random)