diff --git a/CHANGELOG b/CHANGELOG index 0da84d759..33e88aa7a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -80,3 +80,4 @@ - Add Family Crest quest. - Add mort myre stems and pears to bloom's effect, and add the sound effect for bloom. - Add proper sound effects for the explorer's ring and fix leaf-bladed sword's sound effects. +- Fix wine of zamorak pickup interaction. diff --git a/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java b/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java index df2eeb316..e21bbfbfd 100644 --- a/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java @@ -61,7 +61,6 @@ public final class FaladorNodePlugin extends OptionHandler { // dwarven mine SceneryDefinition.forId(30868).getHandlers().put("option:squeeze-through", this); SceneryDefinition.forId(5020).getHandlers().put("option:ride", this); - ItemDefinition.forId(245).getHandlers().put("option:take", this); // fally park. NPCDefinition.forId(2290).getHandlers().put("option:talk-to", this); SceneryDefinition.forId(11708).getHandlers().put("option:close", this); diff --git a/Server/src/main/java/core/net/packet/in/InteractionPacket.java b/Server/src/main/java/core/net/packet/in/InteractionPacket.java index e244832c9..fb97b1b8f 100644 --- a/Server/src/main/java/core/net/packet/in/InteractionPacket.java +++ b/Server/src/main/java/core/net/packet/in/InteractionPacket.java @@ -355,9 +355,12 @@ public final class InteractionPacket implements IncomingPacket { player.debug("Handled by quest interaction manager."); return; } - if(InteractionListeners.run(item.getId(), InteractionListener.Companion.getGROUNDITEM(), option.getName(),player,item)){ + if(InteractionListeners.run(item.getId(), InteractionListener.Companion.getGROUNDITEM(), option.getName(), player, item)) { return; - } + } + if(InteractionListeners.run(item.getId(), InteractionListener.Companion.getITEM(), option.getName(), player, item)) { + return; + } item.getInteraction().handle(player, option); } 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 839eea3f8..ced4bdf72 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 @@ -9,7 +9,7 @@ import rs09.game.interaction.InteractionListener class WineOfZamorakInteraction : InteractionListener() { override fun defineListeners() { - on(Items.WINE_OF_ZAMORAK_245,ITEM,"take"){player, wine -> + on(Items.WINE_OF_ZAMORAK_245,GROUNDITEM,"take"){player, wine -> if(player.location.regionId != 11574){ PickupHandler.take(player, wine as GroundItem) return@on true @@ -24,4 +24,4 @@ class WineOfZamorakInteraction : InteractionListener() { return@on true } } -} \ No newline at end of file +}