diff options
Diffstat (limited to 'src/main/java/me/xmrvizzy')
-rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java | 2 | ||||
-rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java | 21 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java index 19789dba..da082c2d 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java @@ -5,7 +5,7 @@ import me.xmrvizzy.skyblocker.config.SkyblockerConfig; public class MoltenWaveFilter extends SimpleChatFilter { public MoltenWaveFilter() { - super("^Your Molten Wave hit " + NUMBER + " enemy(?:y|ies) for " + NUMBER + " damage\\.$"); + super("^Your Molten Wave hit " + NUMBER + " enem(?:y|ies) for " + NUMBER + " damage\\.$"); } @Override 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"); } |