phaneron/smartcmd-MinecraftConsoles
1
0
Fork 0
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-05-25 08:03:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modernize project codebase (#906)

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

* Add safety checks and fix a issue with vector going OOR
This commit is contained in:
ModMaker101 2026-03-08 19:08:36 -04:00 • committed by GitHub
parent 88798b501d
commit 28614b922f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1373 changed files with 20086 additions and 19527 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Minecraft.World/TemptGoal.cpp
View file

@ -29,10 +29,10 @@ bool TemptGoal::canUse()
return false;
}
player = weak_ptr<Player>(mob->level->getNearestPlayer(mob->shared_from_this(), 10));
if (player.lock() == NULL) return false;
if (player.lock() == nullptr) return false;
mob->setDespawnProtected(); // If we've got a nearby player, then consider this mob as something we'd miss if it despawned
shared_ptr<ItemInstance> item = player.lock()->getSelectedItem();
if (item == NULL) return false;
if (item == nullptr) return false;
if (item->id != itemId) return false;
return true;
}
@ -41,7 +41,7 @@ bool TemptGoal::canContinueToUse()
{
if (canScare)
{
if(player.lock() == NULL) return false;
if(player.lock() == nullptr) return false;
if (mob->distanceToSqr(player.lock()) < 6 * 6)
{
if (player.lock()->distanceToSqr(px, py, pz) > 0.1 * 0.1) return false;