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 +1 -1
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cf6cc08b26 - Show all commits

2
Server/src/main/content/global/activity/cchallange/npc/ZombieChampionNPC.kt
View file

@ -63,8 +63,8 @@ class ZombieChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(i
val player = state.attacker val player = state.attacker
if (player is Player) { if (player is Player) {
if (state.style == CombatStyle.MELEE || state.style == CombatStyle.RANGE) { if (state.style == CombatStyle.MELEE || state.style == CombatStyle.RANGE) {
state.estimatedHit = state.maximumHit
state.neutralizeHits() state.neutralizeHits()
state.estimatedHit = state.maximumHit
} }
if (state.style == CombatStyle.MAGIC) { if (state.style == CombatStyle.MAGIC) {
sendMessage(player, "You cannot use spells in this challenge.") sendMessage(player, "You cannot use spells in this challenge.")