diff --git a/build.gradle b/build.gradle index 8a37373..8aa3864 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id "java" } -version = "2.9" +version = "2.9.1" group = "me.cephetir.skyskipped" archivesBaseName = "SkySkipped" diff --git a/src/main/kotlin/me/cephetir/skyskipped/event/events/BlockClickEvent.kt b/src/main/kotlin/me/cephetir/skyskipped/event/events/BlockClickEvent.kt index cc553a6..1a32311 100644 --- a/src/main/kotlin/me/cephetir/skyskipped/event/events/BlockClickEvent.kt +++ b/src/main/kotlin/me/cephetir/skyskipped/event/events/BlockClickEvent.kt @@ -20,4 +20,4 @@ package me.cephetir.skyskipped.event.events import net.minecraft.util.BlockPos import net.minecraftforge.fml.common.eventhandler.Event -class BlockClickEvent(val pos: BlockPos) : Event() \ No newline at end of file +class BlockClickEvent(val pos: BlockPos?) : Event() \ No newline at end of file diff --git a/src/main/kotlin/me/cephetir/skyskipped/features/impl/hacks/FailSafe.kt b/src/main/kotlin/me/cephetir/skyskipped/features/impl/hacks/FailSafe.kt index 572a305..c5dc421 100644 --- a/src/main/kotlin/me/cephetir/skyskipped/features/impl/hacks/FailSafe.kt +++ b/src/main/kotlin/me/cephetir/skyskipped/features/impl/hacks/FailSafe.kt @@ -204,7 +204,7 @@ class FailSafe : Feature() { @SubscribeEvent fun onChat(event: ClientChatReceivedEvent) { if (!called4) return - if (!event.message.unformattedText.stripColor().contains("The Farming Contest is over!")) return + if (!event.message.unformattedText.stripColor().startsWith("[NPC] Jacob: Come see me in Hub to claim your reward!")) return UChat.chat("§cSkySkipped §f:: §eJacob event ended! Starting macro again...") if (lastMacro) MacroBuilder.onKey() else CF4M.INSTANCE.moduleManager.toggle("AutoFarm") @@ -306,7 +306,7 @@ class FailSafe : Feature() { if (!pizza && !cheeto) return if (Config.failSafeDesyncMode != 1) return - if (lastBlock != null) return + if (lastBlock != null || event.pos == null) return if (mc.theWorld.getBlockState(event.pos).block is IPlantable) lastBlock = LastBlock(event.pos, Config.failSafeDesyncTime * 20) }