celisej567/mcpe
1
0
Fork 0
mirror of https://github.com/celisej567/mcpe.git synced 2026-09-17 20:10:23 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Fix some issues related to holding no item in hand

Browse Source
This commit is contained in:
iProgramInCpp
2023-12-10 13:24:55 +02:00
parent 89a7ee5ab6
commit 7f393150e1
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/client/app/Minecraft.cpp
View File

@@ -302,7 +302,8 @@ void Minecraft::handleBuildAction(BuildActionIntention* pAction)
else
{
ItemInstance* pItem = getSelectedItem();
if (m_pGameMode->useItemOn(
if (pItem &&
m_pGameMode->useItemOn(
m_pLocalPlayer,
m_pLevel,
pItem->m_itemID <= 0 ? nullptr : pItem,
@@ -1129,16 +1130,14 @@ ItemInstance* Minecraft::getSelectedItem()
ItemInstance* pInst = m_pLocalPlayer->m_pInventory->getSelectedItem();
if (!pInst)
{
m_CurrItemInstance.m_itemID = -1;
m_CurrItemInstance.m_amount = 999;
m_CurrItemInstance.m_auxValue = 0;
return &m_CurrItemInstance;
}
return nullptr;
if (m_pGameMode->isSurvivalType())
return pInst;
if (pInst->m_itemID == 0)
return nullptr;
m_CurrItemInstance.m_itemID = pInst->m_itemID;
m_CurrItemInstance.m_amount = 999;
m_CurrItemInstance.m_auxValue = pInst->m_auxValue;