From 999ff2256c1384a5ca4db2e7069207127404cfff Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Fri, 7 Jun 2024 12:59:25 +1000 Subject: Backend: Use event.cancel() over event.isCanceled = true for LorenzEvents (#1915) --- .../at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt | 8 ++++---- .../at/hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt | 2 +- .../at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt | 2 +- .../hannibal2/skyhanni/features/fishing/trophy/GeyserFishing.kt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/fishing') diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt index 074c6a20d..5f64aba8c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/ChumBucketHider.kt @@ -36,7 +36,7 @@ object ChumBucketHider { if (entity !is EntityArmorStand) return if (entity in hiddenEntities) { - event.isCanceled = true + event.cancel() return } @@ -47,7 +47,7 @@ object ChumBucketHider { if (name.contains(LorenzUtils.getPlayerName()) && !config.hideOwn.get()) return titleEntity.add(entity) hiddenEntities.add(entity) - event.isCanceled = true + event.cancel() return } @@ -57,7 +57,7 @@ object ChumBucketHider { for (title in titleEntity.toSet()) { if (entityLocation.equalsIgnoreY(title.getLorenzVec())) { hiddenEntities.add(entity) - event.isCanceled = true + event.cancel() return } } @@ -69,7 +69,7 @@ object ChumBucketHider { for (title in titleEntity.toSet()) { if (entityLocation.equalsIgnoreY(title.getLorenzVec())) { hiddenEntities.add(entity) - event.isCanceled = true + event.cancel() return } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt index 8275b7676..6e2211f58 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt @@ -63,7 +63,7 @@ object FishingHookDisplay { if (!config.hideArmorStand) return if (event.entity == armorStand) { - event.isCanceled = true + event.cancel() } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt index 707a6827d..0410a04a9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt @@ -76,7 +76,7 @@ object TotemOfCorruption { for (totem in totems) { if (event.type == EnumParticleTypes.SPELL_WITCH && event.speed == 0.0f) { if (totem.location.distance(event.location) < 4.0) { - event.isCanceled = true + event.cancel() } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GeyserFishing.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GeyserFishing.kt index ed702ca6e..24f52e0b2 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GeyserFishing.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GeyserFishing.kt @@ -72,7 +72,7 @@ object GeyserFishing { val geyser = geyser ?: return if (bobber.distanceTo(event.location) < 3 && bobber.distanceTo(geyser) < 3) { - event.isCanceled = true + event.cancel() } } -- cgit