From 4d668f32a6d9a0d895a2385dec994d43bd084410 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sun, 10 Nov 2019 00:36:29 +0100
Subject: Call on_secondary_use when object is right-clicked

---
 src/network/serverpackethandler.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/network/serverpackethandler.cpp')

diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index d8fbeebd5..7a42ce5ef 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -1316,6 +1316,13 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 					<< pointed_object->getDescription() << std::endl;
 
 			// Do stuff
+			if (m_script->item_OnSecondaryUse(
+					selected_item, playersao, pointed)) {
+				if (playersao->setWieldedItem(selected_item)) {
+					SendInventory(playersao, true);
+				}
+			}
+
 			pointed_object->rightClick(playersao);
 		} else if (m_script->item_OnPlace(
 				selected_item, playersao, pointed)) {
@@ -1376,8 +1383,10 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 		actionstream << player->getName() << " activates "
 				<< selected_item.name << std::endl;
 
+		pointed.type = POINTEDTHING_NOTHING; // can only ever be NOTHING
+
 		if (m_script->item_OnSecondaryUse(
-				selected_item, playersao)) {
+				selected_item, playersao, pointed)) {
 			if (playersao->setWieldedItem(selected_item)) {
 				SendInventory(playersao, true);
 			}
-- 
cgit v1.2.3