From 4a55dde5ee40ba9694c166fcaa60b2a26baac81f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 18 Feb 2020 12:40:53 -0500
Subject: [PATCH] Bugfixes

---
 .../java/mindustry/annotations/impl/SerializeProcess.java | 2 +-
 core/assets/bundles/bundle.properties                     | 2 +-
 core/src/mindustry/entities/traits/BuilderTrait.java      | 8 ++++++--
 core/src/mindustry/ui/dialogs/SettingsMenuDialog.java     | 7 ++++++-
 gradle.properties                                         | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java b/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java
index aba76e3f55..bf49845330 100644
--- a/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java
@@ -21,7 +21,7 @@ public class SerializeProcess extends BaseProcessor{
     /** Target class name. */
     private static final String className = "Serialization";
     /** Name of the base package to put all the generated classes. */
-    private static final String data = "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";
+    private static final String data = "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";
 
     @Override
     public void process(RoundEnvironment env) throws Exception{
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 7f02ce667b..070873fc32 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -64,7 +64,7 @@ stat.rank = Final Rank: [accent]{0}
 launcheditems = [accent]Launched Items
 launchinfo = [unlaunched][[LAUNCH] your core to obtain the items indicated in blue.
 map.delete = Are you sure you want to delete the map "[accent]{0}[]"?
-level.highscore = High Score: [accent]{0}
+level.highscore = High Score: [accent]{0}1
 level.select = Level Select
 level.mode = Gamemode:
 showagain = Don't show again next session
diff --git a/core/src/mindustry/entities/traits/BuilderTrait.java b/core/src/mindustry/entities/traits/BuilderTrait.java
index a05fc685ec..80176eac1a 100644
--- a/core/src/mindustry/entities/traits/BuilderTrait.java
+++ b/core/src/mindustry/entities/traits/BuilderTrait.java
@@ -1,14 +1,15 @@
 package mindustry.entities.traits;
 
 import arc.*;
-import arc.struct.Queue;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
+import arc.struct.Queue;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.content.*;
+import mindustry.entities.type.TileEntity;
 import mindustry.entities.type.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
@@ -21,7 +22,7 @@ import java.io.*;
 import java.util.*;
 
 import static mindustry.Vars.*;
-import static mindustry.entities.traits.BuilderTrait.BuildDataStatic.*;
+import static mindustry.entities.traits.BuilderTrait.BuildDataStatic.tmptr;
 
 /** Interface for units that build things.*/
 public interface BuilderTrait extends Entity, TeamTrait{
@@ -74,6 +75,9 @@ public interface BuilderTrait extends Entity, TeamTrait{
                 buildQueue().removeFirst();
                 return;
             }
+        }else if(tile.getTeam() != getTeam()){
+            buildQueue().removeFirst();
+            return;
         }
 
         if(tile.entity instanceof BuildEntity && !current.initialized){
diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
index 2b4e336d67..af4f6db807 100644
--- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -330,7 +330,12 @@ public class SettingsMenuDialog extends SettingsDialog{
         if(Shaders.shield != null){
             graphics.checkPref("animatedshields", !mobile);
         }
-        graphics.checkPref("bloom", !mobile, val -> renderer.toggleBloom(val));
+        if(!ios){
+            graphics.checkPref("bloom", !mobile, val -> renderer.toggleBloom(val));
+        }else{
+            Core.settings.put("bloom", false);
+        }
+
         graphics.checkPref("pixelate", false, val -> {
             if(val){
                 Events.fire(Trigger.enablePixelation);
diff --git a/gradle.properties b/gradle.properties
index dc5c21b2cb..d496de7400 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=415c435dc59e9248fdef8362582220d18f9f8e17
+archash=7f149f0747ff41f1bfa80e2153d2b66402ba63c1