aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/EntityIO.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/EntityIO.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/EntityIO.cpp')
-rw-r--r--Minecraft.World/EntityIO.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/Minecraft.World/EntityIO.cpp b/Minecraft.World/EntityIO.cpp
index 086015dc..9c7c64d4 100644
--- a/Minecraft.World/EntityIO.cpp
+++ b/Minecraft.World/EntityIO.cpp
@@ -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
}