From d77ea764768f5cde9e8f0781356a67d723aa7609 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Mon, 23 Sep 2019 00:28:26 +0200 Subject: [PATCH] Fix broken build The variable name changed but this didn't cause merge conflicts, so it wasn't caught before. --- src/network/serverpackethandler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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() &&