aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/rift
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/rift
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/rift')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftHorsezookaHider.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt2
9 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
index 3c9f69640..e1664e6c8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
@@ -71,13 +71,13 @@ object RiftWiltedBerberisHelper {
if (event.type != EnumParticleTypes.FIREWORKS_SPARK) {
if (config.hideparticles && berberis != null) {
- event.isCanceled = true
+ event.cancel()
}
return
}
if (config.hideparticles) {
- event.isCanceled = true
+ event.cancel()
}
if (berberis == null) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
index 24df4324c..c09c7873f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
@@ -52,12 +52,12 @@ object LivingCaveDefenseBlocks {
// Ignore particles around blocks
if (staticBlocks.any { it.location.distance(location) < 3 }) {
if (config.hideParticles) {
- event.isCanceled = true
+ event.cancel()
}
return
}
if (config.hideParticles && movingBlocks.keys.any { it.location.distance(location) < 3 }) {
- event.isCanceled = true
+ event.cancel()
}
if (event.type == EnumParticleTypes.CRIT_MAGIC) {
@@ -86,7 +86,7 @@ object LivingCaveDefenseBlocks {
movingBlocks = movingBlocks.editCopy { this[defenseBlock] = System.currentTimeMillis() + 250 }
if (config.hideParticles) {
- event.isCanceled = true
+ event.cancel()
}
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt
index 337b46824..a3ecd7fd5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt
@@ -84,7 +84,7 @@ object LivingCaveLivingMetalHelper {
pair?.let {
if (it.second.distance(event.location) < 3) {
- event.isCanceled = true
+ event.cancel()
}
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
index e91f11f9f..89e5d556b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt
@@ -131,7 +131,7 @@ object DanceRoomHelper {
@SubscribeEvent
fun onTitleReceived(event: TitleReceivedEvent) {
if (!isEnabled()) return
- if (config.hideOriginalTitle && inRoom) event.isCanceled = true
+ if (config.hideOriginalTitle && inRoom) event.cancel()
}
private fun startCountdown(seconds: Int, milliseconds: Int) {
@@ -160,7 +160,7 @@ object DanceRoomHelper {
if (RiftAPI.inRift() && config.hidePlayers) {
val entity = event.entity
if (entity is EntityOtherPlayerMP && inRoom) {
- event.isCanceled = true
+ event.cancel()
}
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt
index fd9c3eee0..d61331c23 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt
@@ -39,7 +39,7 @@ object RiftLavaMazeParkour {
parkourHelper?.let {
if (it.inParkour()) {
- event.isCanceled = true
+ event.cancel()
}
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
index 6278ee653..ac12b43c0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt
@@ -39,7 +39,7 @@ object RiftUpsideDownParkour {
parkourHelper?.let {
if (it.inParkour()) {
- event.isCanceled = true
+ event.cancel()
}
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt
index 9de52ba47..e835e3846 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt
@@ -41,7 +41,7 @@ object TubulatorParkour {
parkourHelper?.let {
if (it.inParkour()) {
- event.isCanceled = true
+ event.cancel()
}
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftHorsezookaHider.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftHorsezookaHider.kt
index 3a4717279..d708ca577 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftHorsezookaHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftHorsezookaHider.kt
@@ -17,7 +17,7 @@ object RiftHorsezookaHider {
if (!SkyHanniMod.feature.rift.horsezookaHider) return
if (event.entity is EntityHorse && InventoryUtils.itemInHandId.equals("HORSEZOOKA")) {
- event.isCanceled = true
+ event.cancel()
}
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt
index 927416963..f5c0baf8c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/RiftMotesOrb.kt
@@ -55,7 +55,7 @@ object RiftMotesOrb {
orb.counter++
orb.pickedUp = false
if (config.hideParticles && orb.isOrb) {
- event.isCanceled = true
+ event.cancel()
}
}
}