projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-01-17 00:06:00 -05:00
Code Issues Projects Releases Wiki Activity

Fixed infinite duration buffs expiring immediately

Browse Source
This commit is contained in:
Ziggy
2024-07-01 21:15:29 +02:00
parent e17537cb6b
commit eb99d84324
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/projectswg/holocore/services/gameplay/combat/buffs/BuffService.kt
View File

@@ -97,7 +97,7 @@ class BuffService : Service() {
}
private fun removeExpiredBuffs(creatureObject: CreatureObject) {
val crcsForExpiredBuffs = creatureObject.buffs.filter { isBuffExpired(creatureObject, it.value) }.map { it.key }
val crcsForExpiredBuffs = creatureObject.buffs.map { it.key }.filter { isBuffExpired(creatureObject, it) }
crcsForExpiredBuffs.forEach { removeBuff(creatureObject, it) }
}
@@ -112,7 +112,12 @@ class BuffService : Service() {
return ProjectSWG.galacticTime.toInt()
}
private fun isBuffExpired(creature: CreatureObject, buff: Buff): Boolean {
private fun isBuffExpired(creature: CreatureObject, buffCrc: CRC): Boolean {
val buffData = buffs.getBuff(buffCrc) ?: return true
val buff = creature.buffs[buffCrc] ?: return true
if (isBuffInfinite(buffData)) return false
return calculatePlayTime(creature) >= buff.endTime
}
@@ -196,8 +201,8 @@ class BuffService : Service() {
private fun scheduleBuffExpirationCheck(receiver: CreatureObject, buffData: BuffInfo) {
timerCheckThread.execute(1000L) {
val buff = receiver.buffs[buffData.crc] ?: return@execute
if (isBuffExpired(receiver, buff)) {
receiver.buffs[buffData.crc] ?: return@execute
if (isBuffExpired(receiver, buffData.crc)) {
removeBuff(receiver, buffData.crc)
} else {
scheduleBuffExpirationCheck(receiver, buffData)