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/EntitySelector.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/EntitySelector.cpp')
| -rw-r--r-- | Minecraft.World/EntitySelector.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Minecraft.World/EntitySelector.cpp b/Minecraft.World/EntitySelector.cpp index 0f575c73..36c7bf88 100644 --- a/Minecraft.World/EntitySelector.cpp +++ b/Minecraft.World/EntitySelector.cpp @@ -12,7 +12,7 @@ bool AliveEntitySelector::matches(shared_ptr<Entity> entity) const bool ContainerEntitySelector::matches(shared_ptr<Entity> entity) const { - return (dynamic_pointer_cast<Container>(entity) != nullptr) && entity->isAlive(); + return (dynamic_pointer_cast<Container>(entity) != NULL) && entity->isAlive(); } MobCanWearArmourEntitySelector::MobCanWearArmourEntitySelector(shared_ptr<ItemInstance> item) @@ -27,7 +27,7 @@ bool MobCanWearArmourEntitySelector::matches(shared_ptr<Entity> entity) const shared_ptr<LivingEntity> mob = dynamic_pointer_cast<LivingEntity>(entity); - if (mob->getCarried(Mob::getEquipmentSlotForItem(item)) != nullptr) return false; + if (mob->getCarried(Mob::getEquipmentSlotForItem(item)) != NULL) return false; if ( mob->instanceof(eTYPE_MOB) ) { |