From a5b5fdf4d6ae8cd98d32b73e0ba0070642e3220b Mon Sep 17 00:00:00 2001
From: damighty <27978131-real_damighty@users.noreply.gitlab.com>
Date: Sun, 31 Aug 2025 12:03:14 +0300
Subject: [PATCH] Fixed Digsite quest items that damage player on drop
 potentially dealing more damage than intended

---
 .../quest/thedigsite/TheDigSiteListeners.kt   | 60 +++++++++++--------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/Server/src/main/content/region/misthalin/digsite/quest/thedigsite/TheDigSiteListeners.kt b/Server/src/main/content/region/misthalin/digsite/quest/thedigsite/TheDigSiteListeners.kt
index 470451817..a79a331bd 100644
--- a/Server/src/main/content/region/misthalin/digsite/quest/thedigsite/TheDigSiteListeners.kt
+++ b/Server/src/main/content/region/misthalin/digsite/quest/thedigsite/TheDigSiteListeners.kt
@@ -826,43 +826,53 @@ class TheDigSiteListeners : InteractionListener {
         }
 
         on(Items.UNIDENTIFIED_LIQUID_702, ITEM, "drop") { player, node ->
-            removeItem(player, node)
-            impact(player, 25)
-            sendChat(player, "Ow! The liquid exploded!")
-            sendMessage(player, "You were injured by the burning liquid.")
-            return@on true
+            if (removeItem(player, node)) {
+                impact(player, 25)
+                sendChat(player, "Ow! The liquid exploded!")
+                sendMessage(player, "You were injured by the burning liquid.")
+                return@on true
+            }
+            return@on false
         }
 
         on(Items.NITROGLYCERIN_703, ITEM, "drop") { player, node ->
-            removeItem(player, node)
-            impact(player, 35)
-            sendChat(player, "Ow! The nitroglycerin exploded!")
-            sendMessage(player, "You were injured by the burning liquid.")
-            return@on true
+            if (removeItem(player, node)) {
+                impact(player, 35)
+                sendChat(player, "Ow! The nitroglycerin exploded!")
+                sendMessage(player, "You were injured by the burning liquid.")
+                return@on true
+            }
+            return@on false
         }
 
         on(Items.MIXED_CHEMICALS_705, ITEM, "drop") { player, node ->
-            removeItem(player, node)
-            impact(player, 45)
-            sendChat(player, "Ow! The liquid exploded!")
-            sendMessage(player, "You were injured by the burning liquid.")
-            return@on true
+            if (removeItem(player, node)) {
+                impact(player, 45)
+                sendChat(player, "Ow! The liquid exploded!")
+                sendMessage(player, "You were injured by the burning liquid.")
+                return@on true
+            }
+            return@on false
         }
 
         on(Items.MIXED_CHEMICALS_706, ITEM, "drop") { player, node ->
-            removeItem(player, node)
-            impact(player, 55)
-            sendChat(player, "Ow! The liquid exploded!")
-            sendMessage(player, "You were injured by the burning liquid.")
-            return@on true
+            if (removeItem(player, node)) {
+                impact(player, 55)
+                sendChat(player, "Ow! The liquid exploded!")
+                sendMessage(player, "You were injured by the burning liquid.")
+                return@on true
+            }
+            return@on false
         }
 
         on(Items.CHEMICAL_COMPOUND_707, ITEM, "drop") { player, node ->
-            removeItem(player, node)
-            impact(player, 65)
-            sendChat(player, "Ow! The liquid exploded!")
-            sendMessage(player, "You were injured by the burning liquid.")
-            return@on true
+            if (removeItem(player, node)) {
+                impact(player, 65)
+                sendChat(player, "Ow! The liquid exploded!")
+                sendMessage(player, "You were injured by the burning liquid.")
+                return@on true
+            }
+            return@on false
         }
 
         // Scenery not tied to quest