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

8
Minecraft.World/Silverfish.cpp
View File

@@ -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;
}