From f64c765df39e15ca105413312e321137ea95b9dd Mon Sep 17 00:00:00 2001
From: Syndromeramo <ohafiz97@gmail.com>
Date: Tue, 7 Oct 2025 14:13:49 -0500
Subject: [PATCH] Cleaned up logic and removed comments.

---
 .../decoration/kitchen/AbstractContainer.kt   |  4 +-
 .../kitchen/BeerBarrelInteraction.kt          | 44 +------------------
 .../decoration/kitchen/StoveInteraction.kt    |  3 +-
 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/Server/src/main/content/global/skill/construction/decoration/kitchen/AbstractContainer.kt b/Server/src/main/content/global/skill/construction/decoration/kitchen/AbstractContainer.kt
index 0e8639a42..6086aff25 100644
--- a/Server/src/main/content/global/skill/construction/decoration/kitchen/AbstractContainer.kt
+++ b/Server/src/main/content/global/skill/construction/decoration/kitchen/AbstractContainer.kt
@@ -2,7 +2,6 @@ package content.global.skill.construction.decoration.kitchen
 
 import core.api.addItem
 import core.api.freeSlots
-import core.api.hasSpaceFor
 import core.api.sendDialogue
 import core.game.dialogue.DialogueFile
 import core.game.dialogue.Topic
@@ -19,8 +18,7 @@ abstract class AbstractContainer(containerId: Int, containers: Map<Int,List<Pair
 
     private fun checkItem(player: Player, idx : Int){
         val item = containerItemsIds[idx]
-        if (hasSpaceFor(player, item, 1)){
-            addItem(player, item)
+        if (addItem(player, item)){
             end()
         }
         else{
diff --git a/Server/src/main/content/global/skill/construction/decoration/kitchen/BeerBarrelInteraction.kt b/Server/src/main/content/global/skill/construction/decoration/kitchen/BeerBarrelInteraction.kt
index cde768a66..4c6ee0949 100644
--- a/Server/src/main/content/global/skill/construction/decoration/kitchen/BeerBarrelInteraction.kt
+++ b/Server/src/main/content/global/skill/construction/decoration/kitchen/BeerBarrelInteraction.kt
@@ -26,46 +26,4 @@ class BeerBarrelInteraction : InteractionListener {
             return@onUseWith true
         }
     }
-}
-
-/*
-
-    override fun handle(event: NodeUsageEvent): Boolean {
-        val player = event.player
-        val `object` = event.usedWith as Scenery
-
-        if (player.inventory.remove(Item(BEER_GLASS_1919))) {
-            player.animate(Animation.create(3661 + (`object`.id - 13569)))
-            player.sendMessage(
-                "You fill up your glass with " + `object`.name.lowercase(Locale.getDefault()).replace("barrel", "")
-                    .trim { it <= ' ' } + ".")
-            player.inventory.add(Item(getReward(`object`.id), 1))
-        }
-        return true
-    }
-
-    /**
-     * Get the beer reward based on the interacted barrel.
-     * @return the item to give.
-     */
-    fun getReward(barrelId: Int): Int {
-        when (barrelId) {
-            13568 -> return 1917
-            13569 -> return 5763
-            13570 -> return 1905
-            13571 -> return 1909
-            13572 -> return 1911
-            13573 -> return 5755
-        }
-        return 1917
-    }
-
-    companion object {
-        /**
-         * The object ids
-         */
-        private val OBJECTS = intArrayOf(
-            13568, 13569, 13570, 13571, 13572, 13573
-        )
-    }
-}*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/Server/src/main/content/global/skill/construction/decoration/kitchen/StoveInteraction.kt b/Server/src/main/content/global/skill/construction/decoration/kitchen/StoveInteraction.kt
index 6298209cc..74b0c35f4 100644
--- a/Server/src/main/content/global/skill/construction/decoration/kitchen/StoveInteraction.kt
+++ b/Server/src/main/content/global/skill/construction/decoration/kitchen/StoveInteraction.kt
@@ -66,7 +66,7 @@ class StoveInteraction : InteractionListener {
 
         on(stoves_with_kettle, SCENERY, "take-kettle"){ player, node ->
             if (getAttribute(player, kettleBoiled, 0) == 0){
-                sendMessage(player, "This is not your kettle.") //inauthentic message
+                sendMessage(player, "This is not your kettle.")
                 return@on false
             }
             else if (getAttribute(player, kettleBoiled, 0) == 1){
@@ -79,7 +79,6 @@ class StoveInteraction : InteractionListener {
                 return@on true
             }
             else {
-                //todo get the authentic message
                 sendMessage(player, "You do not have space to do that.")
                 return@on false
             }