From e56227b2b0598110213da3ff29ba1f181b91e705 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 29 Jul 2026 17:40:15 -0400 Subject: [PATCH] Fixed #12428 --- core/src/mindustry/type/Sector.java | 2 +- core/src/mindustry/ui/dialogs/JoinDialog.java | 1 + gradle.properties | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java index 9219281b72..761694482f 100644 --- a/core/src/mindustry/type/Sector.java +++ b/core/src/mindustry/type/Sector.java @@ -123,7 +123,7 @@ public class Sector{ } public boolean isShielded(){ - return preset != null && preset.shieldSectors.size > 0 && preset.shieldSectors.contains(s -> !s.isCaptured()); + return preset != null && preset.shieldSectors.size > 0 && !isCaptured() && preset.shieldSectors.contains(s -> !s.isCaptured()); } public boolean isAttacked(){ diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index 571dc2e2eb..8a73de0282 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -467,6 +467,7 @@ public class JoinDialog extends BaseDialog{ boolean needsSort = false; + //hub servers are ignored if(!sortPing && !Strings.stripColors(res.name).toLowerCase(Locale.ROOT).contains("hub") && groupTable[0].userObject instanceof Integer count){ //hack: apply large numerical offset to favorite servers int actualCount = (count >= favoriteCountOffset ? res.players + favoriteCountOffset : res.players); diff --git a/gradle.properties b/gradle.properties index 1748cb499d..a97aaec5a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=8fe6402778 +archash=24135dd285