Merge remote-tracking branch 'origin/main' into main

isXander · Jul 13, 2021 · 1e6f2cb · 1e6f2cb
2 parents 15704e9 + 4a954da
commit 1e6f2cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -5,9 +5,9 @@ name: Java CI with Gradle
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, kotlin-rewrite ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, kotlin-rewrite ]
 
 jobs:
   build:

diff --git a/src/main/java/co/uk/isxander/evergreenhud/utils/ServerPingerUtil.java b/src/main/java/co/uk/isxander/evergreenhud/utils/ServerPingerUtil.java
@@ -79,7 +79,7 @@ public void updateManually(ServerData server) {
             }
 
             if (serverUpdateStatus.getOrDefault(server.serverIP, false)) serverPlayerCount = null;
-            else if (!server.populationInfo.equals("")) {
+            else if (!("".equals(server.populationInfo))) {
                 String[] splitPopulationInfo = GuiUtils.stripFormattingCodes(server.populationInfo).split("/");
 
                 serverPlayerCount = Integer.parseInt(splitPopulationInfo[0]);