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/client | |
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/client')
-rw-r--r-- | src/client/content_cao.cpp | 3 | ||||
-rw-r--r-- | src/client/game.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp index 1e79d00c9..5c8465b22 100644 --- a/src/client/content_cao.cpp +++ b/src/client/content_cao.cpp @@ -1870,7 +1870,8 @@ bool GenericCAO::directReportPunch(v3f dir, const ItemStack *punchitem, m_armor_groups, toolcap, punchitem, - time_from_last_punch); + time_from_last_punch, + punchitem->wear); if(result.did_punch && result.damage != 0) { diff --git a/src/client/game.cpp b/src/client/game.cpp index 57951dc95..7f0aff49c 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -3619,7 +3619,8 @@ void Game::handleDigging(const PointedThing &pointed, const v3s16 &nodepos, // cheat detection. // Get digging parameters DigParams params = getDigParams(nodedef_manager->get(n).groups, - &selected_item.getToolCapabilities(itemdef_manager)); + &selected_item.getToolCapabilities(itemdef_manager), + selected_item.wear); // If can't dig, try hand if (!params.diggable) { |