aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/Silverfish.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.World/Silverfish.cpp
parenta9be52c41a02d207233199e98898fe7483d7e817 (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/Silverfish.cpp')
-rw-r--r--Minecraft.World/Silverfish.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Minecraft.World/Silverfish.cpp b/Minecraft.World/Silverfish.cpp
index 98f559c9..5cd4c77e 100644
--- a/Minecraft.World/Silverfish.cpp
+++ b/Minecraft.World/Silverfish.cpp
@@ -72,7 +72,7 @@ int Silverfish::getDeathSound()
bool Silverfish::hurt(DamageSource *source, float dmg)
{
if (isInvulnerable()) return false;
- if (lookForFriends <= 0 && (dynamic_cast<EntityDamageSource *>(source) != nullptr || source == DamageSource::magic))
+ if (lookForFriends <= 0 && (dynamic_cast<EntityDamageSource *>(source) != NULL || source == DamageSource::magic))
{
// look for friends
lookForFriends = 20;
@@ -173,7 +173,7 @@ void Silverfish::serverAiStep()
}
}
- if (attackTarget == nullptr && !isPathFinding())
+ if (attackTarget == NULL && !isPathFinding())
{
// if the silverfish isn't doing anything special, it will merge
// with any rock tile it is nearby
@@ -193,7 +193,7 @@ void Silverfish::serverAiStep()
}
}
- else if (attackTarget != nullptr && !isPathFinding())
+ else if (attackTarget != NULL && !isPathFinding())
{
attackTarget = nullptr;
}
@@ -216,7 +216,7 @@ bool Silverfish::canSpawn()
if (Monster::canSpawn())
{
shared_ptr<Player> nearestPlayer = level->getNearestPlayer(shared_from_this(), 5.0);
- return nearestPlayer == nullptr;
+ return nearestPlayer == NULL;
}
return false;
}