From: sfan5 Date: Sun, 22 Sep 2019 22:28:26 +0000 (+0200) Subject: Fix broken build X-Git-Tag: 5.1.0~25 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d77ea764768f5cde9e8f0781356a67d723aa7609;p=oweals%2Fminetest.git Fix broken build The variable name changed but this didn't cause merge conflicts, so it wasn't caught before. --- diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index 8c2ba823c..d8fbeebd5 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -1166,9 +1166,9 @@ void Server::handleCommand_Interact(NetworkPacket *pkt) u16 wear = pointed_object->punch(dir, &toolcap, playersao, time_from_last_punch); - bool changed = punchitem.addWear(wear, m_itemdef); + bool changed = selected_item.addWear(wear, m_itemdef); if (changed) - playersao->setWieldedItem(punchitem); + playersao->setWieldedItem(selected_item); // If the object is a player and its HP changed if (src_original_hp != pointed_object->getHP() &&