aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrandon <brandon.wamboldt@gmail.com>2023-09-15 05:44:12 -0300
committerGitHub <noreply@github.com>2023-09-15 10:44:12 +0200
commitc78ef258593969ea30fb6c38042b3e65acd91024 (patch)
treeaaa76dbeb55824be02495f9e064c342e8c9b5e0f /src
parent5eae6a82b10cca07f3148f4d831ce285051634ca (diff)
downloadskyhanni-c78ef258593969ea30fb6c38042b3e65acd91024.tar.gz
skyhanni-c78ef258593969ea30fb6c38042b3e65acd91024.tar.bz2
skyhanni-c78ef258593969ea30fb6c38042b3e65acd91024.zip
Fix: One area in the zealot hideout showing as The End (#461)
Co-authored-by: Brandon Wamboldt <brandon.wamboldt@maplewave.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 329b6b1b3..abd5615ea 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -14,11 +14,11 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import net.minecraftforge.fml.common.network.FMLNetworkEvent
class HypixelData {
- private val config get() = SkyHanniMod.feature.dev
private val tabListProfilePattern = "§e§lProfile: §r§a(?<profile>.*)".toPattern()
private val westVillageFarmArea = AxisAlignedBB(-54.0, 69.0, -115.0, -40.0, 75.0, -127.0)
private val howlingCaveArea = AxisAlignedBB(-401.0, 50.0, -104.0, -337.0, 90.0, 36.0)
- private val zealotBruiserHideoutArea = AxisAlignedBB(-520.0, 66.0, -332.0, -558.0, 85.0, -280.0)
+ private val fakeZealotBruiserHideoutArea = AxisAlignedBB(-520.0, 66.0, -332.0, -558.0, 85.0, -280.0)
+ private val realZealotBruiserHideoutArea = AxisAlignedBB(-552.0, 50.0, -245.0, -580.0, 72.0, -209.0)
companion object {
var hypixelLive = false
@@ -84,7 +84,8 @@ class HypixelData {
skyBlockArea = when {
skyBlockIsland == IslandType.THE_RIFT && westVillageFarmArea.isPlayerInside() -> "Dreadfarm"
skyBlockIsland == IslandType.THE_PARK && howlingCaveArea.isPlayerInside() -> "Howling Cave"
- skyBlockIsland == IslandType.THE_END && zealotBruiserHideoutArea.isPlayerInside() -> "The End"
+ skyBlockIsland == IslandType.THE_END && fakeZealotBruiserHideoutArea.isPlayerInside() -> "The End"
+ skyBlockIsland == IslandType.THE_END && realZealotBruiserHideoutArea.isPlayerInside() -> "Zealot Bruiser Hideout"
else -> originalLocation
}