Merge branch 'main' into upstream-merge

This commit is contained in:
George V. committed 2026-04-11 02:52:52 +03:00
commit a0f4063807
92 files changed
+1619 -60

No files matched your search

@@ -386,6 +386,7 @@ bool ServerPlayerGameMode::useItem(shared_ptr<Player> player, Level *level, shar
player->inventory->items[player->inventory->selected] = itemInstance;
if (isCreative())
{
//if (!(Item::items[itemInstance->id]->getBaseItemType() == 7 || Item::items[itemInstance->id]->getBaseItemType() == 8 || Item::items[itemInstance->id]->getBaseItemType() == 9 || Item::items[itemInstance->id]->getBaseItemType() == 10))
itemInstance->count = oldCount;
if (itemInstance->isDamageableItem()) itemInstance->setAuxValue(oldAux);
}