aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/Silverfish.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/Silverfish.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/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 5cd4c77e..98f559c9 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) != NULL || source == DamageSource::magic))
+ if (lookForFriends <= 0 && (dynamic_cast<EntityDamageSource *>(source) != nullptr || source == DamageSource::magic))
{
// look for friends
lookForFriends = 20;
@@ -173,7 +173,7 @@ void Silverfish::serverAiStep()
}
}
- if (attackTarget == NULL && !isPathFinding())
+ if (attackTarget == nullptr && !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 != NULL && !isPathFinding())
+ else if (attackTarget != nullptr && !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 == NULL;
+ return nearestPlayer == nullptr;
}
return false;
}