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

20
Minecraft.World/EntityIO.cpp
View File

@@ -135,8 +135,8 @@ shared_ptr<Entity> EntityIO::newEntity(const wstring& id, Level *level)
if(it != idCreateMap->end() )
{
entityCreateFn create = it->second;
if (create != nullptr) entity = shared_ptr<Entity>(create(level));
if( ( entity != nullptr ) && entity->GetType() == eTYPE_ENDERDRAGON )
if (create != NULL) entity = shared_ptr<Entity>(create(level));
if( ( entity != NULL ) && entity->GetType() == eTYPE_ENDERDRAGON )
{
dynamic_pointer_cast<EnderDragon>(entity)->AddParts(); // 4J added to finalise creation
}
@@ -173,14 +173,14 @@ shared_ptr<Entity> EntityIO::loadStatic(CompoundTag *tag, Level *level)
if(it != idCreateMap->end() )
{
entityCreateFn create = it->second;
if (create != nullptr) entity = shared_ptr<Entity>(create(level));
if( ( entity != nullptr ) && entity->GetType() == eTYPE_ENDERDRAGON )
if (create != NULL) entity = shared_ptr<Entity>(create(level));
if( ( entity != NULL ) && entity->GetType() == eTYPE_ENDERDRAGON )
{
dynamic_pointer_cast<EnderDragon>(entity)->AddParts(); // 4J added to finalise creation
}
}
if (entity != nullptr)
if (entity != NULL)
{
entity->load(tag);
}
@@ -201,14 +201,14 @@ shared_ptr<Entity> EntityIO::newById(int id, Level *level)
if(it != numCreateMap->end() )
{
entityCreateFn create = it->second;
if (create != nullptr) entity = shared_ptr<Entity>(create(level));
if( ( entity != nullptr ) && entity->GetType() == eTYPE_ENDERDRAGON )
if (create != NULL) entity = shared_ptr<Entity>(create(level));
if( ( entity != NULL ) && entity->GetType() == eTYPE_ENDERDRAGON )
{
dynamic_pointer_cast<EnderDragon>(entity)->AddParts(); // 4J added to finalise creation
}
}
if (entity != nullptr)
if (entity != NULL)
{
}
else
@@ -229,8 +229,8 @@ shared_ptr<Entity> EntityIO::newByEnumType(eINSTANCEOF eType, Level *level)
if(it2 != numCreateMap->end() )
{
entityCreateFn create = it2->second;
if (create != nullptr) entity = shared_ptr<Entity>(create(level));
if( ( entity != nullptr ) && entity->GetType() == eTYPE_ENDERDRAGON )
if (create != NULL) entity = shared_ptr<Entity>(create(level));
if( ( entity != NULL ) && entity->GetType() == eTYPE_ENDERDRAGON )
{
dynamic_pointer_cast<EnderDragon>(entity)->AddParts(); // 4J added to finalise creation
}