Merge remote-tracking branch 'origin/main' into exp/worldgen

This commit is contained in:
github-actions 2026-05-28 18:24:09 +00:00
commit f4f3836715

View file

@ -199,7 +199,7 @@ bool Ocelot::mobInteract(shared_ptr<Player> player)
} }
else else
{ {
if (temptGoal->isRunning() && item != nullptr && item->id == Item::fish_raw_Id && player->distanceToSqr(shared_from_this()) < 3 * 3) if (/*temptGoal->isRunning() &&*/ item != nullptr && item->id == Item::fish_raw_Id && player->distanceToSqr(shared_from_this()) < 3 * 3)
{ {
// 4J-PB - don't lose the fish in creative mode // 4J-PB - don't lose the fish in creative mode
if (!player->abilities.instabuild) item->count--; if (!player->abilities.instabuild) item->count--;