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

Project modernization (#630)

Browse Source 
* 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
This commit is contained in:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 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 != NULL) entity = shared_ptr<Entity>(create(level));
if( ( entity != NULL ) && entity->GetType() == eTYPE_ENDERDRAGON )
if (create != nullptr) entity = shared_ptr<Entity>(create(level));
if( ( entity != nullptr ) && 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 != NULL) entity = shared_ptr<Entity>(create(level));
if( ( entity != NULL ) && entity->GetType() == eTYPE_ENDERDRAGON )
if (create != nullptr) entity = shared_ptr<Entity>(create(level));
if( ( entity != nullptr ) && entity->GetType() == eTYPE_ENDERDRAGON )
{
dynamic_pointer_cast<EnderDragon>(entity)->AddParts(); // 4J added to finalise creation
}
}
if (entity != NULL)
if (entity != nullptr)
{
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 != NULL) entity = shared_ptr<Entity>(create(level));
if( ( entity != NULL ) && entity->GetType() == eTYPE_ENDERDRAGON )
if (create != nullptr) entity = shared_ptr<Entity>(create(level));
if( ( entity != nullptr ) && entity->GetType() == eTYPE_ENDERDRAGON )
{
dynamic_pointer_cast<EnderDragon>(entity)->AddParts(); // 4J added to finalise creation
}
}
if (entity != NULL)
if (entity != nullptr)
{
}
else
@@ -229,8 +229,8 @@ shared_ptr<Entity> EntityIO::newByEnumType(eINSTANCEOF eType, Level *level)
if(it2 != numCreateMap->end() )
{
entityCreateFn create = it2->second;
if (create != NULL) entity = shared_ptr<Entity>(create(level));
if( ( entity != NULL ) && entity->GetType() == eTYPE_ENDERDRAGON )
if (create != nullptr) entity = shared_ptr<Entity>(create(level));
if( ( entity != nullptr ) && entity->GetType() == eTYPE_ENDERDRAGON )
{
dynamic_pointer_cast<EnderDragon>(entity)->AddParts(); // 4J added to finalise creation
}