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) --- src/main/java/at/hannibal2/skyhanni/features/slayer/HideMobNames.kt | 4 ++-- .../hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt | 4 ++-- .../skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt | 2 +- .../skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/slayer') diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/HideMobNames.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/HideMobNames.kt index 215990f7c..23ee38751 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/HideMobNames.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/HideMobNames.kt @@ -63,7 +63,7 @@ object HideMobNames { val id = entity.entityId if (lastMobName.getOrNull(id) == name) { if (id in mobNamesHidden) { - event.isCanceled = true + event.cancel() } return } @@ -72,7 +72,7 @@ object HideMobNames { mobNamesHidden.remove(id) if (shouldNameBeHidden(name)) { - event.isCanceled = true + event.cancel() mobNamesHidden.add(id) } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt index 6d32a76ef..b7d97adf4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt @@ -40,7 +40,7 @@ object BlazeSlayerClearView { @SubscribeEvent fun onReceiveParticle(event: ReceiveParticleEvent) { if (isEnabled()) { - event.isCanceled = true + event.cancel() } } @@ -49,7 +49,7 @@ object BlazeSlayerClearView { if (isEnabled()) { val entity = event.entity if (entity is EntityFireball) { - event.isCanceled = true + event.cancel() } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt index 23889ec5c..a07868d0e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt @@ -191,7 +191,7 @@ object BlazeSlayerDaggerHelper { it.updated = true } shield.active = true - event.isCanceled = true + event.cancel() clientSideClicked = false return } diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt index 3c110e83d..9a3c0aa1f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerHideParticles.kt @@ -42,7 +42,7 @@ object EndermanSlayerHideParticles { val distance = event.location.distanceToNearestEnderman() ?: return if (distance < 9) { - event.isCanceled = true + event.cancel() } } -- cgit