aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/utils
diff options
context:
space:
mode:
authorKevin <92656833+kevinthegreat1@users.noreply.github.com>2024-03-18 00:42:36 -0400
committerGitHub <noreply@github.com>2024-03-18 00:42:36 -0400
commit23f44b47c3f37fc3dc3e25724d4f8e9c2996a1e4 (patch)
treed7c5738daaf20160158578ec90603ea69988b084 /src/main/java/de/hysky/skyblocker/utils
parent6448ef2ad0b6197876ad1b1a05dbc621d76cd39b (diff)
parent4f8f1bf6e647e547906ac1d0a7a6c8ef1f8ead34 (diff)
downloadSkyblocker-23f44b47c3f37fc3dc3e25724d4f8e9c2996a1e4.tar.gz
Skyblocker-23f44b47c3f37fc3dc3e25724d4f8e9c2996a1e4.tar.bz2
Skyblocker-23f44b47c3f37fc3dc3e25724d4f8e9c2996a1e4.zip
Merge pull request #596 from kevinthegreat1/profile-waypoints-fix
Fix fairy and enigma souls profile loading and add chat profile detection
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/utils')
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/Utils.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java
index 08d0b167..3e3bc4af 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Utils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java
@@ -37,6 +37,8 @@ public class Utils {
private static final String ALTERNATE_HYPIXEL_ADDRESS = System.getProperty("skyblocker.alternateHypixelAddress", "");
private static final String PROFILE_PREFIX = "Profile: ";
+ private static final String PROFILE_MESSAGE_PREFIX = "§aYou are playing on profile: §e";
+ public static final String PROFILE_ID_PREFIX = "Profile ID: ";
private static boolean isOnHypixel = false;
private static boolean isOnSkyblock = false;
private static boolean isInjected = false;
@@ -424,10 +426,14 @@ public class Utils {
return shouldFilter;
}
- if (isOnSkyblock && message.startsWith("Profile ID: ")) {
- profileId = message.replace("Profile ID: ", "");
+ if (isOnSkyblock) {
+ if (message.startsWith(PROFILE_MESSAGE_PREFIX)) {
+ profile = message.substring(PROFILE_MESSAGE_PREFIX.length()).split("§b")[0];
+ } else if (message.startsWith(PROFILE_ID_PREFIX)) {
+ profileId = message.substring(PROFILE_ID_PREFIX.length());
- MuseumItemCache.tick(profileId);
+ MuseumItemCache.tick(profileId);
+ }
}
return true;