From 2da55ddef028c9f74e34f39f0db30e2b2637903f Mon Sep 17 00:00:00 2001
From: Ceikry <ironceikry@gmail.com>
Date: Sun, 21 Mar 2021 22:32:33 -0500
Subject: [PATCH] yhh

---
 .../game/interaction/SpecialGroundItems.java  |  2 +-
 .../falador/WineOfZamorakInteraction.kt       | 39 ++++++++++---------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/Server/src/main/java/core/game/interaction/SpecialGroundItems.java b/Server/src/main/java/core/game/interaction/SpecialGroundItems.java
index 0e86dbd28..b56ce1fee 100644
--- a/Server/src/main/java/core/game/interaction/SpecialGroundItems.java
+++ b/Server/src/main/java/core/game/interaction/SpecialGroundItems.java
@@ -3,7 +3,7 @@ package core.game.interaction;
 import core.game.node.item.GroundItem;
 import core.game.node.item.GroundItemManager;
 import core.game.world.map.Location;
-import core.game.interaction.city.falador.WineOfZamorakInteraction;
+import rs09.game.interaction.region.falador.WineOfZamorakInteraction;
 import core.game.interaction.city.portsarim.AhabBeerInteraction;
 
 /**
diff --git a/Server/src/main/kotlin/rs09/game/interaction/region/falador/WineOfZamorakInteraction.kt b/Server/src/main/kotlin/rs09/game/interaction/region/falador/WineOfZamorakInteraction.kt
index a73c42490..839eea3f8 100644
--- a/Server/src/main/kotlin/rs09/game/interaction/region/falador/WineOfZamorakInteraction.kt
+++ b/Server/src/main/kotlin/rs09/game/interaction/region/falador/WineOfZamorakInteraction.kt
@@ -1,24 +1,27 @@
-package core.game.interaction.city.falador;
+package rs09.game.interaction.region.falador
 
-import core.game.interaction.Option;
-import core.game.interaction.SpecialGroundInteraction;
-import core.game.interaction.SpecialGroundItems;
-import core.game.node.entity.npc.NPC;
-import core.game.node.entity.player.Player;
-import core.game.world.map.RegionManager;
+import core.game.node.item.GroundItem
+import core.game.world.map.RegionManager
+import org.rs09.consts.Items
+import rs09.game.content.global.action.PickupHandler
+import rs09.game.interaction.InteractionListener
 
-import java.util.List;
+class WineOfZamorakInteraction : InteractionListener() {
 
-public class WineOfZamorakInteraction extends SpecialGroundInteraction {
-    @Override
-    public void handle(Player player, Option option){
-        player.faceLocation(SpecialGroundItems.WINE_OF_ZAMORAK.getLocation());
-        final List<NPC> npcs = RegionManager.getLocalNpcs(player);
-        for (NPC n : npcs) {
-            if (n.getId() == 188) {
-                n.sendChat("Hands off zamorak's wine!");
-                n.getProperties().getCombatPulse().attack(player);
+    override fun defineListeners() {
+        on(Items.WINE_OF_ZAMORAK_245,ITEM,"take"){player, wine ->
+            if(player.location.regionId != 11574){
+                PickupHandler.take(player, wine as GroundItem)
+                return@on true
             }
+            val npcs = RegionManager.getLocalNpcs(player)
+            for (n in npcs) {
+                if (n.id == 188) {
+                    n.sendChat("Hands off zamorak's wine!")
+                    n.properties.combatPulse.attack(player)
+                }
+            }
+            return@on true
         }
     }
-}
+}
\ No newline at end of file