From 7e665d376e1719d8108b6ec693c7a22dab9f143f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 28 Apr 2022 17:09:34 -0400
Subject: [PATCH] Bugfixes

---
 core/assets/bundles/bundle.properties   | 1 -
 core/src/mindustry/game/FogControl.java | 3 +--
 core/src/mindustry/game/Team.java       | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 82cf2f806a..af9aa3e103 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -174,7 +174,6 @@ techtree = Tech Tree
 techtree.select = Tech Tree Selection
 techtree.serpulo = Serpulo
 techtree.erekir = Erekir
-research.legacy = [accent]5.0[] research data found.\nDo you want to [accent]load this data[], or [accent]discard it[] and restart research in the new campaign (recommended)?
 research.load = Load
 research.discard = Discard
 research.list = [lightgray]Research:
diff --git a/core/src/mindustry/game/FogControl.java b/core/src/mindustry/game/FogControl.java
index 8acfa63702..0e446ea5af 100644
--- a/core/src/mindustry/game/FogControl.java
+++ b/core/src/mindustry/game/FogControl.java
@@ -191,8 +191,7 @@ public final class FogControl implements CustomChunk{
             loadedStatic = true;
         }
 
-        //not run clientside, the CPU side isn't needed here.
-        if(staticFogThread == null && !net.client()){
+        if(staticFogThread == null){
             staticFogThread = new StaticFogThread();
             staticFogThread.setPriority(Thread.NORM_PRIORITY - 1);
             staticFogThread.setDaemon(true);
diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java
index f3ca6e5698..6b4b305fa4 100644
--- a/core/src/mindustry/game/Team.java
+++ b/core/src/mindustry/game/Team.java
@@ -31,7 +31,7 @@ public class Team implements Comparable<Team>{
         derelict = new Team(0, "derelict", Color.valueOf("4d4e58")),
         sharded = new Team(1, "sharded", Pal.accent.cpy(), Color.valueOf("ffd37f"), Color.valueOf("eab678"), Color.valueOf("d4816b")),
         crux = new Team(2, "crux", Color.valueOf("f25555"), Color.valueOf("fc8e6c"), Color.valueOf("f25555"), Color.valueOf("a04553")),
-        malis = new Team(3, "malis", Color.valueOf("a27ce5"), Color.valueOf("484988"), Color.valueOf("665c9f"), Color.valueOf("bf92f9")),
+        malis = new Team(3, "malis", Color.valueOf("a27ce5"), Color.valueOf("c195fb"), Color.valueOf("665c9f"), Color.valueOf("484988")),
         green = new Team(4, "green", Color.valueOf("54d67d"), Color.valueOf("96f58c"), Color.valueOf("54d67d"), Color.valueOf("28785c")),
         blue = new Team(5, "blue", Color.valueOf("6c87fd"), Color.valueOf("85caf9"), Color.valueOf("6c87fd"), Color.valueOf("3b3392"));