Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 08:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken build

Browse Source 
The variable name changed but this didn't cause merge conflicts, so it wasn't caught before.
This commit is contained in:
sfan5 2019-09-23 00:28:26 +02:00 committed by GitHub
parent d364b6d0a6
commit d77ea76476
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/serverpackethandler.cpp
View File

@ -1166,9 +1166,9 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
u16 wear = pointed_object->punch(dir, &toolcap, playersao, u16 wear = pointed_object->punch(dir, &toolcap, playersao,
time_from_last_punch); time_from_last_punch);
bool changed = punchitem.addWear(wear, m_itemdef); bool changed = selected_item.addWear(wear, m_itemdef);
if (changed) if (changed)
playersao->setWieldedItem(punchitem); playersao->setWieldedItem(selected_item);
// If the object is a player and its HP changed // If the object is a player and its HP changed
if (src_original_hp != pointed_object->getHP() && if (src_original_hp != pointed_object->getHP() &&