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/BegGoal.cpp
View File

@@ -20,14 +20,14 @@ BegGoal::BegGoal(Wolf *wolf, float lookDistance)
bool BegGoal::canUse()
{
player = weak_ptr<Player>(level->getNearestPlayer(wolf->shared_from_this(), lookDistance));
if (player.lock() == nullptr) return false;
if (player.lock() == NULL) return false;
wolf->setDespawnProtected();
return playerHoldingInteresting(player.lock());
}
bool BegGoal::canContinueToUse()
{
if (player.lock() == nullptr || !player.lock()->isAlive()) return false;
if (player.lock() == NULL || !player.lock()->isAlive()) return false;
if (wolf->distanceToSqr(player.lock()) > lookDistance * lookDistance) return false;
wolf->setDespawnProtected();
return lookTime > 0 && playerHoldingInteresting(player.lock());
@@ -54,7 +54,7 @@ void BegGoal::tick()
bool BegGoal::playerHoldingInteresting(shared_ptr<Player> player)
{
shared_ptr<ItemInstance> item = player->inventory->getSelected();
if (item == nullptr) return false;
if (item == NULL) return false;
if (!wolf->isTame() && item->id == Item::bone_Id) return true;
return wolf->isFood(item);
}