aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/FishingRodItem.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-07 21:56:03 -0500
committerGitHub <noreply@github.com>2026-03-08 09:56:03 +0700
commita9be52c41a02d207233199e98898fe7483d7e817 (patch)
tree71dfaec3a86b05e9ca409b97d8eb9d7f993bfdd0 /Minecraft.World/FishingRodItem.cpp
parent1be5faaea781402e7de06b263eeca4c688b7712c (diff)
Project modernization (#630)
* 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
Diffstat (limited to 'Minecraft.World/FishingRodItem.cpp')
-rw-r--r--Minecraft.World/FishingRodItem.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.World/FishingRodItem.cpp b/Minecraft.World/FishingRodItem.cpp
index 883eb2de..b9eafd18 100644
--- a/Minecraft.World/FishingRodItem.cpp
+++ b/Minecraft.World/FishingRodItem.cpp
@@ -17,7 +17,7 @@ FishingRodItem::FishingRodItem(int id) : Item(id)
{
setMaxDamage(64);
setMaxStackSize(1);
- emptyIcon = NULL;
+ emptyIcon = nullptr;
}
bool FishingRodItem::isHandEquipped()
@@ -32,7 +32,7 @@ bool FishingRodItem::isMirroredArt()
shared_ptr<ItemInstance> FishingRodItem::use(shared_ptr<ItemInstance> instance, Level *level, shared_ptr<Player> player)
{
- if (player->fishing != NULL)
+ if (player->fishing != nullptr)
{
int dmg = player->fishing->retrieve();
instance->hurtAndBreak(dmg, player);
@@ -44,7 +44,7 @@ shared_ptr<ItemInstance> FishingRodItem::use(shared_ptr<ItemInstance> instance,
if (!level->isClientSide)
{
// 4J Stu - Move the player->fishing out of the ctor as we cannot reference 'this'
- shared_ptr<FishingHook> hook = shared_ptr<FishingHook>( new FishingHook(level, player) );
+ shared_ptr<FishingHook> hook = std::make_shared<FishingHook>(level, player);
player->fishing = hook;
level->addEntity( shared_ptr<FishingHook>( hook ) );
}