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/TheEndPortal.cpp
View File

@@ -13,7 +13,7 @@ DWORD TheEndPortal::tlsIdx = TlsAlloc();
// 4J - allowAnywhere is a static in java, implementing as TLS here to make thread safe
bool TheEndPortal::allowAnywhere()
{
return (TlsGetValue(tlsIdx) != nullptr);
return (TlsGetValue(tlsIdx) != NULL);
}
void TheEndPortal::allowAnywhere(bool set)
@@ -28,7 +28,7 @@ TheEndPortal::TheEndPortal(int id, Material *material) : BaseEntityTile(id, mate
shared_ptr<TileEntity> TheEndPortal::newTileEntity(Level *level)
{
return std::make_shared<TheEndPortalTileEntity>();
return shared_ptr<TileEntity>(new TheEndPortalTileEntity());
}
void TheEndPortal::updateShape(LevelSource *level, int x, int y, int z, int forceData, shared_ptr<TileEntity> forceEntity) // 4J added forceData, forceEntity param
@@ -66,7 +66,7 @@ void TheEndPortal::entityInside(Level *level, int x, int y, int z, shared_ptr<En
{
if (entity->GetType() == eTYPE_EXPERIENCEORB ) return; // 4J added
if (entity->riding == nullptr && entity->rider.lock() == nullptr)
if (entity->riding == NULL && entity->rider.lock() == NULL)
{
if (!level->isClientSide)
{