yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cannonballs

Browse Source
This commit is contained in:
Ryan
2022-01-02 15:27:53 +00:00
committed by Ceikry
parent bc67e988cf
commit 2bd8999aa0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/kotlin/api/ContentAPI.kt
+2
View File
@@ -36,6 +36,7 @@ import core.game.world.update.flag.chunk.AnimateObjectUpdateFlag
import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Animation
import core.game.world.update.flag.context.Graphics import core.game.world.update.flag.context.Graphics
import rs09.game.content.dialogue.DialogueFile import rs09.game.content.dialogue.DialogueFile
import rs09.game.content.dialogue.SkillDialogueHandler
import rs09.game.content.global.GlobalKillCounter; import rs09.game.content.global.GlobalKillCounter;
import rs09.game.system.SystemLogger import rs09.game.system.SystemLogger
import rs09.game.system.config.ItemConfigParser; import rs09.game.system.config.ItemConfigParser;
@@ -611,6 +612,7 @@ fun openDialogue(player: Player, dialogue: Any, vararg args: Any) {
when (dialogue) { when (dialogue) {
is Int -> player.dialogueInterpreter.open(dialogue, *args) is Int -> player.dialogueInterpreter.open(dialogue, *args)
is DialogueFile -> player.dialogueInterpreter.open(dialogue, *args) is DialogueFile -> player.dialogueInterpreter.open(dialogue, *args)
is SkillDialogueHandler -> dialogue.open()
else -> SystemLogger.logErr("Invalid object type passed to openDialogue() -> ${dialogue.javaClass.simpleName}") else -> SystemLogger.logErr("Invalid object type passed to openDialogue() -> ${dialogue.javaClass.simpleName}")
} }
} }
Server/src/main/kotlin/rs09/game/interaction/item/withobject/AmmoMouldOnFurnace.kt
+1 -1
View File
@@ -19,7 +19,7 @@ class AmmoMouldOnFurnace : InteractionListener(){
private fun cannonBallOnUseWithHandler(player: Player, used: Node, with: Node): Boolean { private fun cannonBallOnUseWithHandler(player: Player, used: Node, with: Node): Boolean {
face(player, with.centerLocation) face(player, with.centerLocation)
if(isQuestComplete(player, DwarfCannon.NAME)) { if(!isQuestComplete(player, DwarfCannon.NAME)) {
sendDialogue(player, "You need to complete the ${DwarfCannon.NAME} quest in order to do this.") sendDialogue(player, "You need to complete the ${DwarfCannon.NAME} quest in order to do this.")
return true return true
} }