From e774d8ca2fa5ead9f6d739a2031e6655a22a5b4d Mon Sep 17 00:00:00 2001 From: sfan5 Date: Wed, 4 Mar 2020 19:13:26 +0100 Subject: Fixes around ServerActiveObject on_punch handling --- src/network/serverpackethandler.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/network') diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index 7a42ce5ef..23bcc867f 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -1166,6 +1166,8 @@ void Server::handleCommand_Interact(NetworkPacket *pkt) u16 wear = pointed_object->punch(dir, &toolcap, playersao, time_from_last_punch); + // Callback may have changed item, so get it again + playersao->getWieldedItem(&selected_item); bool changed = selected_item.addWear(wear, m_itemdef); if (changed) playersao->setWieldedItem(selected_item); -- cgit v1.2.3