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

6
Minecraft.World/FishingRodItem.cpp
View File

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