summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2019-09-23 00:28:26 +0200
committerGitHub <noreply@github.com>2019-09-23 00:28:26 +0200
commitd77ea764768f5cde9e8f0781356a67d723aa7609 (patch)
tree59fb7774881eafd5ea3924dbd94ce1029cbebe1c
parentd364b6d0a66d309c9d612ae5ae2fb8fc7c32c69f (diff)
downloadminetest-d77ea764768f5cde9e8f0781356a67d723aa7609.tar.gz
minetest-d77ea764768f5cde9e8f0781356a67d723aa7609.tar.bz2
minetest-d77ea764768f5cde9e8f0781356a67d723aa7609.zip
Fix broken build
The variable name changed but this didn't cause merge conflicts, so it wasn't caught before.
-rw-r--r--src/network/serverpackethandler.cpp4
1 files 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() &&