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

6
Minecraft.World/ModifiableAttributeInstance.cpp
View File

@@ -62,7 +62,7 @@ void ModifiableAttributeInstance::getModifiers(unordered_set<AttributeModifier *
AttributeModifier *ModifiableAttributeInstance::getModifier(eMODIFIER_ID id)
{
AttributeModifier *modifier = NULL;
AttributeModifier *modifier = nullptr;
auto it = modifierById.find(id);
if(it != modifierById.end())
@@ -85,7 +85,7 @@ void ModifiableAttributeInstance::addModifiers(unordered_set<AttributeModifier *
void ModifiableAttributeInstance::addModifier(AttributeModifier *modifier)
{
// Can't add modifiers with the same ID (unless the modifier is anonymous)
if (modifier->getId() != eModifierId_ANONYMOUS && getModifier(modifier->getId()) != NULL)
if (modifier->getId() != eModifierId_ANONYMOUS && getModifier(modifier->getId()) != nullptr)
{
assert(0);
// throw new IllegalArgumentException("Modifier is already applied on this attribute!");
@@ -126,7 +126,7 @@ void ModifiableAttributeInstance::removeModifier(AttributeModifier *modifier)
void ModifiableAttributeInstance::removeModifier(eMODIFIER_ID id)
{
AttributeModifier *modifier = getModifier(id);
if (modifier != NULL) removeModifier(modifier);
if (modifier != nullptr) removeModifier(modifier);
}
void ModifiableAttributeInstance::removeModifiers()