diff options
| author | Kevin <92656833+kevinthegreat1@users.noreply.github.com> | 2023-04-18 07:07:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-18 07:07:40 -0700 |
| commit | 2e1384b266c9734ebefc06d85f067b2a80755e89 (patch) | |
| tree | 18cddc6a21aadcb365f81f2186b1ce665c7d76c5 /src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java | |
| parent | bd8415eafe741d37f658c3235658a1f2d9fb4ed2 (diff) | |
| parent | 0e2eea45c86977cae1ff6c5176637c126d3bf707 (diff) | |
| download | Skyblocker-2e1384b266c9734ebefc06d85f067b2a80755e89.tar.gz Skyblocker-2e1384b266c9734ebefc06d85f067b2a80755e89.tar.bz2 Skyblocker-2e1384b266c9734ebefc06d85f067b2a80755e89.zip | |
Merge branch 'SkyblockerMod:master' into master
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java index d9389b58..532de0dd 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java @@ -31,18 +31,19 @@ public class Utils { String string = sidebar.toString(); if (sidebar.isEmpty()) return; - if (sidebar.get(0).contains("SKYBLOCK") && !isOnSkyblock) { - if (!isInjected) { - isInjected = true; - ItemTooltipCallback.EVENT.register(PriceInfoTooltip::onInjectTooltip); + if (sidebar.get(0).contains("SKYBLOCK") || sidebar.get(0).contains("SKIBLOCK")) { + if (!isOnSkyblock) { + if (!isInjected) { + isInjected = true; + ItemTooltipCallback.EVENT.register(PriceInfoTooltip::onInjectTooltip); + } + SkyblockEvents.JOIN.invoker().onSkyblockJoin(); + isOnSkyblock = true; } - SkyblockEvents.JOIN.invoker().onSkyblockJoin(); - isOnSkyblock = true; - } - if (!sidebar.get(0).contains("SKYBLOCK") && isOnSkyblock) { + } else if (isOnSkyblock) { SkyblockEvents.LEAVE.invoker().onSkyblockLeave(); - Utils.isOnSkyblock = false; - Utils.isInDungeons = false; + isOnSkyblock = false; + isInDungeons = false; } isInDungeons = isOnSkyblock && string.contains("The Catacombs"); } |