diff options
| author | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2023-08-24 01:34:48 -0400 |
|---|---|---|
| committer | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2023-08-24 01:34:48 -0400 |
| commit | 06800133f12c6585dbb21dd6822f9c1d887667f7 (patch) | |
| tree | e20a90b7a7cf1177cf4354870ff400c1a54aca02 /src | |
| parent | 8bd3e985c20fa6d00e9ef0e2f3c52a0549a3f2c8 (diff) | |
| download | Skyblocker-06800133f12c6585dbb21dd6822f9c1d887667f7.tar.gz Skyblocker-06800133f12c6585dbb21dd6822f9c1d887667f7.tar.bz2 Skyblocker-06800133f12c6585dbb21dd6822f9c1d887667f7.zip | |
Server brand check
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java index dadb7dc9..d18e8296 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java @@ -13,6 +13,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.network.PlayerListEntry; +import net.minecraft.client.network.ServerInfo; import net.minecraft.scoreboard.Scoreboard; import net.minecraft.scoreboard.ScoreboardObjective; import net.minecraft.scoreboard.ScoreboardPlayerScore; @@ -157,7 +158,8 @@ public class Utils { private static boolean isConnectedToHypixel(MinecraftClient client) { String serverAddress = (client.getCurrentServerEntry() != null) ? client.getCurrentServerEntry().address.toLowerCase() : ""; - boolean isOnHypixel = (serverAddress.equalsIgnoreCase(ALTERNATE_HYPIXEL_ADDRESS) || serverAddress.contains("hypixel.net") || serverAddress.contains("hypixel.io")); + String serverBrand = (client.player != null && client.player.getServerBrand() != null) ? client.player.getServerBrand() : ""; + boolean isOnHypixel = (serverAddress.equalsIgnoreCase(ALTERNATE_HYPIXEL_ADDRESS) || serverAddress.contains("hypixel.net") || serverAddress.contains("hypixel.io") || serverBrand.contains("Hypixel BungeeCord")); return isOnHypixel; } |