Merge 2009scape updates #19

Open
randy wants to merge 204 commits from 2009Scape:master into upstream
Showing only changes of commit 4853262c25 - Show all commits

View file

@ -20,6 +20,7 @@ import core.game.diary.DiaryEventHookBase
import core.game.diary.DiaryLevel import core.game.diary.DiaryLevel
import core.game.event.* import core.game.event.*
import content.data.Quests import content.data.Quests
import core.game.node.entity.player.link.SpellBookManager
class LumbridgeAchivementDiary : DiaryEventHookBase(DiaryType.LUMBRIDGE) { class LumbridgeAchivementDiary : DiaryEventHookBase(DiaryType.LUMBRIDGE) {
@ -401,14 +402,12 @@ class LumbridgeAchivementDiary : DiaryEventHookBase(DiaryType.LUMBRIDGE) {
} }
override fun onSpellCast(player: Player, event: SpellCastEvent) { override fun onSpellCast(player: Player, event: SpellCastEvent) {
when (event.spellId) { if (event.spellBook == SpellBookManager.SpellBook.MODERN && event.spellId == Modern.LUMBRIDGE_TELEPORT) {
Modern.LUMBRIDGE_TELEPORT -> { finishTask(
finishTask( player,
player, DiaryLevel.MEDIUM,
DiaryLevel.MEDIUM, MediumTasks.CAST_LUMBRIDGE_TELEPORT
MediumTasks.CAST_LUMBRIDGE_TELEPORT )
)
}
} }
} }