diff options
| author | Loki Rautio <lokirautio@gmail.com> | 2026-03-07 21:12:22 -0600 |
|---|---|---|
| committer | Loki Rautio <lokirautio@gmail.com> | 2026-03-07 21:12:22 -0600 |
| commit | 087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch) | |
| tree | 69454763e73ca764af4e682d3573080b13138a0e /Minecraft.World/ModifiableAttributeInstance.cpp | |
| parent | a9be52c41a02d207233199e98898fe7483d7e817 (diff) | |
Revert "Project modernization (#630)"
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 a9be52c41a02d207233199e98898fe7483d7e817.
Diffstat (limited to 'Minecraft.World/ModifiableAttributeInstance.cpp')
| -rw-r--r-- | Minecraft.World/ModifiableAttributeInstance.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.World/ModifiableAttributeInstance.cpp b/Minecraft.World/ModifiableAttributeInstance.cpp index 216e5719..3108df4d 100644 --- a/Minecraft.World/ModifiableAttributeInstance.cpp +++ b/Minecraft.World/ModifiableAttributeInstance.cpp @@ -62,7 +62,7 @@ void ModifiableAttributeInstance::getModifiers(unordered_set<AttributeModifier * AttributeModifier *ModifiableAttributeInstance::getModifier(eMODIFIER_ID id) { - AttributeModifier *modifier = nullptr; + AttributeModifier *modifier = NULL; 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()) != nullptr) + if (modifier->getId() != eModifierId_ANONYMOUS && getModifier(modifier->getId()) != NULL) { 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 != nullptr) removeModifier(modifier); + if (modifier != NULL) removeModifier(modifier); } void ModifiableAttributeInstance::removeModifiers() |