From 377cdfb6010b7ff091adc38f17ccd5b3df286b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?=
 <34514239+appgurueu@users.noreply.github.com>
Date: Sat, 25 Oct 2025 17:37:12 +0200
Subject: [PATCH] Check if object is gone before calling `on_rightclick`

fix #16601
---
 src/network/serverpackethandler.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 4d92ad911..0bd6797c9 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -1198,6 +1198,10 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 					SendInventory(player, true);
 			}
 
+			// on_secondary_use might have removed the object
+			if (pointed_object->isGone())
+				return;
+
 			pointed_object->rightClick(playersao);
 		} else if (m_script->item_OnPlace(selected_item, playersao, pointed)) {
 			// Placement was handled in lua