flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

HandleEnchantItem: use a lambda (#4944)

Browse Source
This commit is contained in:
Tiger Wang 2020-09-28 23:38:10 +01:00 committed by GitHub
parent 8eca58a1c9
commit c9fbb43ac7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ClientHandle.cpp
View File

@ -792,11 +792,8 @@ void cClientHandle::HandleEnchantItem(UInt8 a_WindowID, UInt8 a_Enchantment)
return; return;
} }
// Creative players can always enchant: const auto SetEnchantAndBroadcast = [this, &Item, Window]
if (m_Player->IsGameModeCreative())
{ {
Broadcast:
// Set the item slot to our new enchanted item: // Set the item slot to our new enchanted item:
Window->m_SlotArea->SetSlot(0, *m_Player, Item); Window->m_SlotArea->SetSlot(0, *m_Player, Item);
Window->BroadcastWholeWindow(); Window->BroadcastWholeWindow();
@ -805,6 +802,12 @@ void cClientHandle::HandleEnchantItem(UInt8 a_WindowID, UInt8 a_Enchantment)
Window->SetProperty(0, 0, *m_Player); Window->SetProperty(0, 0, *m_Player);
Window->SetProperty(1, 0, *m_Player); Window->SetProperty(1, 0, *m_Player);
Window->SetProperty(2, 0, *m_Player); Window->SetProperty(2, 0, *m_Player);
};
// Creative players can always enchant:
if (m_Player->IsGameModeCreative())
{
SetEnchantAndBroadcast();
return; return;
} }
@ -836,7 +839,7 @@ void cClientHandle::HandleEnchantItem(UInt8 a_WindowID, UInt8 a_Enchantment)
LapisStack.AddCount(-LapisRequired); LapisStack.AddCount(-LapisRequired);
Window->m_SlotArea->SetSlot(1, *m_Player, LapisStack); Window->m_SlotArea->SetSlot(1, *m_Player, LapisStack);
goto Broadcast; SetEnchantAndBroadcast();
} }
} }