luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-18 02:45:21 +02:00
Code Activity

Fix number of tool uses being off by 1..32767 (#11110)

Browse Source
This commit is contained in:
Wuzzy
2021-10-31 22:33:33 +00:00
committed by GitHub
parent 38ba813c55
commit 6910c8d920
18 changed files with 229 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/serverpackethandler.cpp
View File

@@ -1119,8 +1119,8 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
float time_from_last_punch =
playersao->resetTimeFromLastPunch();
u16 wear = pointed_object->punch(dir, &toolcap, playersao,
time_from_last_punch);
u32 wear = pointed_object->punch(dir, &toolcap, playersao,
time_from_last_punch, tool_item.wear);
// Callback may have changed item, so get it again
playersao->getWieldedItem(&selected_item);
@@ -1173,7 +1173,8 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
// Get diggability and expected digging time
DigParams params = getDigParams(m_nodedef->get(n).groups,
&selected_item.getToolCapabilities(m_itemdef));
&selected_item.getToolCapabilities(m_itemdef),
selected_item.wear);
// If can't dig, try hand
if (!params.diggable) {
params = getDigParams(m_nodedef->get(n).groups,