diff options
| author | Julienraptor01 <julienraptor01@gmail.com> | 2023-04-07 00:50:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-07 00:50:18 +0200 |
| commit | de9d2f3f210a5bb9aad3792666d14e3d5d75ebc2 (patch) | |
| tree | 2015098d5c1b0bcd0b0289253e540362b90c56b9 /src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java | |
| parent | 1ff677ec7f1afea7417a79bacd07192ed7f516e3 (diff) | |
| parent | 38352b7ed91d988d7155e97a668fa01db7749b85 (diff) | |
| download | Skyblocker-de9d2f3f210a5bb9aad3792666d14e3d5d75ebc2.tar.gz Skyblocker-de9d2f3f210a5bb9aad3792666d14e3d5d75ebc2.tar.bz2 Skyblocker-de9d2f3f210a5bb9aad3792666d14e3d5d75ebc2.zip | |
Merge branch 'master' into fix-tab-matching
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"); } |