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/server/luaentity_sao.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/server/luaentity_sao.cpp')
| -rw-r--r-- | src/server/luaentity_sao.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/server/luaentity_sao.cpp b/src/server/luaentity_sao.cpp index 1d65ac306..82f6da231 100644 --- a/src/server/luaentity_sao.cpp +++ b/src/server/luaentity_sao.cpp @@ -305,10 +305,11 @@ void LuaEntitySAO::getStaticData(std::string *result) const *result = os.str(); } -u16 LuaEntitySAO::punch(v3f dir, +u32 LuaEntitySAO::punch(v3f dir, const ToolCapabilities *toolcap, ServerActiveObject *puncher, - float time_from_last_punch) + float time_from_last_punch, + u16 initial_wear) { if (!m_registered) { // Delete unknown LuaEntities when punched @@ -326,7 +327,8 @@ u16 LuaEntitySAO::punch(v3f dir, m_armor_groups, toolcap, &tool_item, - time_from_last_punch); + time_from_last_punch, + initial_wear); bool damage_handled = m_env->getScriptIface()->luaentity_Punch(m_id, puncher, time_from_last_punch, toolcap, dir, result.did_punch ? result.damage : 0); |