aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-01-07 02:35:44 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-01-07 02:35:44 +0100
commitf5a2fa2f444817dfc67fc5c26d604fbf18ea6a6a (patch)
treebd8854d919bebfcf1353827001575575f74b2ee9 /src/main/java/at/hannibal2/skyhanni/features
parentf41540169f5e6508d32b504f98a0cde2cbd930f8 (diff)
downloadSkyHanni-f5a2fa2f444817dfc67fc5c26d604fbf18ea6a6a.tar.gz
SkyHanni-f5a2fa2f444817dfc67fc5c26d604fbf18ea6a6a.tar.bz2
SkyHanni-f5a2fa2f444817dfc67fc5c26d604fbf18ea6a6a.zip
Renamed hypixel and skyblock.
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt3
2 files changed, 1 insertions, 9 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
index 27e520ad0..8e6cd4d4a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -1,7 +1,6 @@
package at.hannibal2.skyhanni.features.chat
import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.HypixelData
import at.hannibal2.skyhanni.events.LorenzChatEvent
import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager
import at.hannibal2.skyhanni.utils.LocationUtils
@@ -10,7 +9,6 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor
import at.hannibal2.skyhanni.utils.getLorenzVec
import net.minecraft.client.Minecraft
import net.minecraft.client.entity.EntityOtherPlayerMP
-import net.minecraftforge.event.world.WorldEvent
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import net.minecraftforge.fml.common.gameevent.TickEvent
import java.util.regex.Pattern
@@ -62,11 +60,6 @@ class PlayerDeathMessages {
}
}
- @SubscribeEvent
- fun onWorldChange(event: WorldEvent.Load) {
- HypixelData.skyBlock = false
- }
-
private fun checkOtherPlayers() {
val location = LocationUtils.playerLocation()
for (otherPlayer in Minecraft.getMinecraft().theWorld.loadedEntityList
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
index cbfa28c9a..245fa85af 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
@@ -1,6 +1,5 @@
package at.hannibal2.skyhanni.features.event.diana
-import at.hannibal2.skyhanni.data.HypixelData
import at.hannibal2.skyhanni.events.LorenzChatEvent
import at.hannibal2.skyhanni.utils.LocationUtils
import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -44,7 +43,7 @@ class BurrowWarpHelper {
@SubscribeEvent
fun onStatusBar(event: LorenzChatEvent) {
- if (!HypixelData.skyBlock) return
+ if (!LorenzUtils.inSkyBlock) return
if (event.message == "§cYou haven't unlocked this fast travel destination!") {
val time = System.currentTimeMillis() - lastWarpTime