From 8d3f39d2e5406f43b651f55a2cc773b7808b9080 Mon Sep 17 00:00:00 2001
From: ephphatha <ephphatha@thelettereph.com>
Date: Mon, 18 Apr 2022 00:06:20 +1000
Subject: [PATCH] Clear the held item if it is used to open a quest entrance

---
 Source/controls/plrctrls.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/controls/plrctrls.cpp b/Source/controls/plrctrls.cpp
index bcded078f..4e24ca464 100644
--- a/Source/controls/plrctrls.cpp
+++ b/Source/controls/plrctrls.cpp
@@ -1809,7 +1809,7 @@ void UpdateSpellTarget(spell_id spell)
  */
 bool TryDropItem()
 {
-	const auto &myPlayer = Players[MyPlayerId];
+	auto &myPlayer = Players[MyPlayerId];
 
 	if (myPlayer.HoldItem.isEmpty()) {
 		return false;
@@ -1818,11 +1818,13 @@ bool TryDropItem()
 	if (currlevel == 0) {
 		if (UseItemOpensHive(myPlayer.HoldItem, myPlayer.position.tile)) {
 			NetSendCmdPItem(true, CMD_PUTITEM, { 79, 61 }, myPlayer.HoldItem);
+			myPlayer.HoldItem.Clear();
 			NewCursor(CURSOR_HAND);
 			return true;
 		}
 		if (UseItemOpensCrypt(myPlayer.HoldItem, myPlayer.position.tile)) {
 			NetSendCmdPItem(true, CMD_PUTITEM, { 35, 20 }, myPlayer.HoldItem);
+			myPlayer.HoldItem.Clear();
 			NewCursor(CURSOR_HAND);
 			return true;
 		}