Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 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 = nullptr;
emptyIcon = NULL;
}
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 != nullptr)
if (player->fishing != NULL)
{
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 = std::make_shared<FishingHook>(level, player);
shared_ptr<FishingHook> hook = shared_ptr<FishingHook>( new FishingHook(level, player) );
player->fishing = hook;
level->addEntity( shared_ptr<FishingHook>( hook ) );
}