mirror of
https://github.com/Anuken/Mindustry.git
synced 2026-10-01 18:50:27 +03:00
Fixed #12428
This commit is contained in:
@@ -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(){
|
||||
|
||||
@@ -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);
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user