diff options
| author | Wuzzy <wuzzy2@mail.ru> | 2021-10-31 22:33:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-31 22:33:33 +0000 |
| commit | 6910c8d920acedb3f1df1ac03a5cdf14f5fb6081 (patch) | |
| tree | ae01925fc35e2301a87ec53897f96b1f56c955fb /src/network/serverpackethandler.cpp | |
| parent | 38ba813c55489595cd78ab2f952be2e954083cfa (diff) | |
| download | minetest-6910c8d920acedb3f1df1ac03a5cdf14f5fb6081.tar.gz minetest-6910c8d920acedb3f1df1ac03a5cdf14f5fb6081.tar.bz2 minetest-6910c8d920acedb3f1df1ac03a5cdf14f5fb6081.zip | |
Fix number of tool uses being off by 1..32767 (#11110)
Diffstat (limited to 'src/network/serverpackethandler.cpp')
| -rw-r--r-- | src/network/serverpackethandler.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index d4bef3ca2..c1ddb5005 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -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, |