Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge 2009scape updates #19

Open
randy wants to merge 204 commits from 2009Scape:master into upstream
pull from: 2009Scape:master
merge into: Snowscape:upstream
Conversation 0 Commits 204 Files changed 719 +5
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b68f914440 - Show all commits

5
Server/src/main/core/game/system/timer/impl/Skulled.kt
View file

@ -19,6 +19,11 @@ class Skulled : PersistTimer (1, "skulled", flags = arrayOf(TimerFlag.ClearOnDea
return false return false
} }
override fun onRemoval (entity: Entity) {
if (entity !is Player) return
entity.skullManager.reset()
}
override fun getTimer (vararg args: Any) : RSTimer { override fun getTimer (vararg args: Any) : RSTimer {
val t = Skulled() val t = Skulled()
t.runInterval = args.getOrNull(0) as? Int ?: 500 t.runInterval = args.getOrNull(0) as? Int ?: 500