diff options
| author | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2023-04-03 16:20:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-03 16:20:32 -0400 |
| commit | a6c0dc7cb98882a0d815664d2f54dda4e8ab288a (patch) | |
| tree | 2927ff578fffc2486bd9a58537079c8c6f57f950 /src/main/java/me/xmrvizzy/skyblocker/utils | |
| parent | 447b0558aa57b4fae036186a58e980f2969b5890 (diff) | |
| parent | 4fdf580f0e630bcc2933699709ffc42e0f199c80 (diff) | |
| download | Skyblocker-a6c0dc7cb98882a0d815664d2f54dda4e8ab288a.tar.gz Skyblocker-a6c0dc7cb98882a0d815664d2f54dda4e8ab288a.tar.bz2 Skyblocker-a6c0dc7cb98882a0d815664d2f54dda4e8ab288a.zip | |
Merge branch 'master' into dungeon-map-scale-adjustment
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils')
| -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"); } |