aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/EnderpearlItem.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/EnderpearlItem.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/EnderpearlItem.cpp')
-rw-r--r--Minecraft.World/EnderpearlItem.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Minecraft.World/EnderpearlItem.cpp b/Minecraft.World/EnderpearlItem.cpp
index e1ed693b..c024190b 100644
--- a/Minecraft.World/EnderpearlItem.cpp
+++ b/Minecraft.World/EnderpearlItem.cpp
@@ -19,7 +19,7 @@ shared_ptr<ItemInstance> EnderpearlItem::use(shared_ptr<ItemInstance> instance,
{
// 4J-PB - Not sure why this was disabled for creative mode, so commenting out
//if (player->abilities.instabuild) return instance;
- if (player->riding != NULL) return instance;
+ if (player->riding != nullptr) return instance;
if (!player->abilities.instabuild)
{
instance->count--;
@@ -28,7 +28,7 @@ shared_ptr<ItemInstance> EnderpearlItem::use(shared_ptr<ItemInstance> instance,
level->playEntitySound(player, eSoundType_RANDOM_BOW, 0.5f, 0.4f / (random->nextFloat() * 0.4f + 0.8f));
if (!level->isClientSide)
{
- level->addEntity( shared_ptr<ThrownEnderpearl>( new ThrownEnderpearl(level, player) ) );
+ level->addEntity(std::make_shared<ThrownEnderpearl>(level, player));
}
return instance;
} \ No newline at end of file