From e92e307431d336189dcb8199492d59e57f38d0db Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 28 Apr 2022 12:21:19 -0400
Subject: [PATCH] Minor fixes

---
 core/src/mindustry/content/Blocks.java |  4 ++--
 core/src/mindustry/core/Logic.java     | 10 +++++++++-
 core/src/mindustry/game/Team.java      |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 484649253e..bfa1f827f1 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1591,7 +1591,7 @@ public class Blocks{
             requirements(Category.defense, with(Items.beryllium, 6));
             health = 130 * wallHealthMultiplier;
             armor = 2f;
-            buildCostMultiplier = 6.5f;
+            buildCostMultiplier = 8f;
         }};
 
         berylliumWallLarge = new Wall("beryllium-wall-large"){{
@@ -1606,7 +1606,7 @@ public class Blocks{
             requirements(Category.defense, with(Items.tungsten, 6));
             health = 180 * wallHealthMultiplier;
             armor = 14f;
-            buildCostMultiplier = 6.5f;
+            buildCostMultiplier = 8f;
         }};
 
         tungstenWallLarge = new Wall("tungsten-wall-large"){{
diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java
index 024948f67b..33f839e05f 100644
--- a/core/src/mindustry/core/Logic.java
+++ b/core/src/mindustry/core/Logic.java
@@ -343,7 +343,10 @@ public class Logic implements ApplicationListener{
                 }
             }
 
-            if(!net.client() && first.complete()){
+            boolean completed = false;
+
+            //multiple objectives can be updated in the same frame
+            while(!net.client() && first != null && first.complete()){
                 state.rules.objectives.remove(0);
                 first.completed();
                 //apply flags.
@@ -359,6 +362,11 @@ public class Logic implements ApplicationListener{
                     }
                 }
 
+                first = state.rules.objectives.first();
+                completed = true;
+            }
+
+            if(completed){
                 //TODO call packet for this?
                 if(net.server()){
                     Call.setRules(state.rules);
diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java
index a9eac49514..f3ca6e5698 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("995bb0"), Color.valueOf("f08dd5"), Color.valueOf("995bb0"), Color.valueOf("312c63")),
+        malis = new Team(3, "malis", Color.valueOf("a27ce5"), Color.valueOf("484988"), Color.valueOf("665c9f"), Color.valueOf("bf92f9")),
         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"));