aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/combat
diff options
context:
space:
mode:
authorCalMWolfs <94038482+CalMWolfs@users.noreply.github.com>2024-06-07 12:59:25 +1000
committerGitHub <noreply@github.com>2024-06-07 12:59:25 +1000
commit999ff2256c1384a5ca4db2e7069207127404cfff (patch)
tree0627f6370b1f94d2697ed1af7827046e75c880c9 /src/main/java/at/hannibal2/skyhanni/features/combat
parent0d4efbd22a8ee629fe2f504fe3aa7acb78a66a2e (diff)
downloadskyhanni-999ff2256c1384a5ca4db2e7069207127404cfff.tar.gz
skyhanni-999ff2256c1384a5ca4db2e7069207127404cfff.tar.bz2
skyhanni-999ff2256c1384a5ca4db2e7069207127404cfff.zip
Backend: Use event.cancel() over event.isCanceled = true for LorenzEvents (#1915)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/combat')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/HideDamageSplash.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AshfangMinisNametagHider.kt2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/HideDamageSplash.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/HideDamageSplash.kt
index 6bc0094e3..215d4a0a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/HideDamageSplash.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/HideDamageSplash.kt
@@ -19,7 +19,7 @@ object HideDamageSplash {
if (!SkyHanniMod.feature.combat.hideDamageSplash) return
if (DamageIndicatorManager.isDamageSplash(event.entity)) {
- event.isCanceled = true
+ event.cancel()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
index 21a70fe4e..58455cee7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
@@ -870,7 +870,7 @@ class DamageIndicatorManager {
if (entityData != null) {
if (config.hideDamageSplash) {
- event.isCanceled = true
+ event.cancel()
}
if (entityData.bossType == BossType.DUMMY) {
val uuid = entity.uniqueID
@@ -887,7 +887,7 @@ class DamageIndicatorManager {
if (name.contains("Overflux")) return
if (name.contains("Mana Flux")) return
if (name.contains("Radiant")) return
- event.isCanceled = true
+ event.cancel()
}
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AshfangMinisNametagHider.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AshfangMinisNametagHider.kt
index 53c5d9650..55c3f7833 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AshfangMinisNametagHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AshfangMinisNametagHider.kt
@@ -25,7 +25,7 @@ object AshfangMinisNametagHider {
val name = entity.name
if (name.contains("§cArachne's Brood§r")) {
- event.isCanceled = true
+ event.cancel()
}
}
}