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

3
Server/src/main/core/api/ContentAPI.kt
View file

@ -3034,6 +3034,9 @@ fun applyPoison (entity: Entity, source: Entity, severity: Int) {
if(hasTimerActive<PoisonImmunity>(entity)) {
return
}
if(entity.isPoisonImmune()) {
return
}
val existingTimer = getTimer<Poison>(entity)
if (existingTimer != null) {