2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-11 17:10:21 -07:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-zammywine' into 'master'

Browse source 
Fix wine of zamorak pickup interaction.

See merge request 2009scape/2009scape!363
This commit is contained in:
Ceikry 2021-12-30 17:22:30 +00:00
commit 5d4c67b02a
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -80,3 +80,4 @@
- Add Family Crest quest. - Add Family Crest quest.
- Add mort myre stems and pears to bloom's effect, and add the sound effect for bloom. - 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. - Add proper sound effects for the explorer's ring and fix leaf-bladed sword's sound effects.
- Fix wine of zamorak pickup interaction.

1
Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java
View file

@ -61,7 +61,6 @@ public final class FaladorNodePlugin extends OptionHandler {
// dwarven mine // dwarven mine
SceneryDefinition.forId(30868).getHandlers().put("option:squeeze-through", this); SceneryDefinition.forId(30868).getHandlers().put("option:squeeze-through", this);
SceneryDefinition.forId(5020).getHandlers().put("option:ride", this); SceneryDefinition.forId(5020).getHandlers().put("option:ride", this);
ItemDefinition.forId(245).getHandlers().put("option:take", this);
// fally park. // fally park.
NPCDefinition.forId(2290).getHandlers().put("option:talk-to", this); NPCDefinition.forId(2290).getHandlers().put("option:talk-to", this);
SceneryDefinition.forId(11708).getHandlers().put("option:close", this); SceneryDefinition.forId(11708).getHandlers().put("option:close", this);

3
Server/src/main/java/core/net/packet/in/InteractionPacket.java
View file

@ -357,6 +357,9 @@ public final class InteractionPacket implements IncomingPacket {
} }
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; return;
}
if(InteractionListeners.run(item.getId(), InteractionListener.Companion.getITEM(), option.getName(), player, item)) {
return;
} }
item.getInteraction().handle(player, option); item.getInteraction().handle(player, option);
} }

2
Server/src/main/kotlin/rs09/game/interaction/region/falador/WineOfZamorakInteraction.kt
View file

@ -9,7 +9,7 @@ import rs09.game.interaction.InteractionListener
class WineOfZamorakInteraction : InteractionListener() { class WineOfZamorakInteraction : InteractionListener() {
override fun defineListeners() { 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){ if(player.location.regionId != 11574){
PickupHandler.take(player, wine as GroundItem) PickupHandler.take(player, wine as GroundItem)
return@on true return@on true