From ff990925f03c80cfbf4ba10444adb07a16a79b90 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 30 Jul 2020 21:41:17 -0400
Subject: [PATCH] Bugfixes

---
 .../mindustry/android/AndroidLauncher.java    |  18 --------------
 core/assets/planets/TODO.dat                  | Bin 23522 -> 0 bytes
 core/src/mindustry/core/NetServer.java        |   1 +
 core/src/mindustry/game/SectorInfo.java       |   6 +++++
 core/src/mindustry/io/SaveMeta.java           |   2 +-
 core/src/mindustry/net/Packets.java           |   5 ++--
 .../mindustry/ui/dialogs/PlanetDialog.java    |   2 ++
 .../mindustry/desktop/DesktopLauncher.java    |  22 ++----------------
 8 files changed, 15 insertions(+), 41 deletions(-)
 delete mode 100644 core/assets/planets/TODO.dat

diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java
index bfa89526e2..2a5e9aba4b 100644
--- a/android/src/mindustry/android/AndroidLauncher.java
+++ b/android/src/mindustry/android/AndroidLauncher.java
@@ -64,24 +64,6 @@ public class AndroidLauncher extends AndroidApplication{
                 moveTaskToBack(true);
             }
 
-            @Override
-            public String getUUID(){
-                try{
-                    String s = Secure.getString(getContext().getContentResolver(), Secure.ANDROID_ID);
-                    int len = s.length();
-                    byte[] data = new byte[len / 2];
-                    for(int i = 0; i < len; i += 2){
-                        data[i / 2] = (byte)((Character.digit(s.charAt(i), 16) << 4)
-                        + Character.digit(s.charAt(i + 1), 16));
-                    }
-                    String result = new String(Base64Coder.encode(data));
-                    if(result.equals("AAAAAAAAAOA=")) throw new RuntimeException("Bad UUID.");
-                    return result;
-                }catch(Exception e){
-                    return super.getUUID();
-                }
-            }
-
             @Override
             public rhino.Context getScriptContext(){
                 return AndroidRhinoContext.enter(getContext().getCacheDir());
diff --git a/core/assets/planets/TODO.dat b/core/assets/planets/TODO.dat
deleted file mode 100644
index eb42302979b85297383fa59219182a3e8d6187a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23522
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
NzyRLB1@bln2LS&cP=5db

diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index a1b07c52f6..5708a470c7 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -687,6 +687,7 @@ public class NetServer implements ApplicationListener{
             logic.skipWave();
         }else if(action == AdminAction.ban){
             netServer.admins.banPlayerIP(other.con.address);
+            netServer.admins.banPlayerID(other.con.uuid);
             other.kick(KickReason.banned);
             Log.info("&lc@ has banned @.", player.name, other.name);
         }else if(action == AdminAction.kick){
diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java
index 0460344f22..2ad9d24640 100644
--- a/core/src/mindustry/game/SectorInfo.java
+++ b/core/src/mindustry/game/SectorInfo.java
@@ -79,6 +79,8 @@ public class SectorInfo{
 
         //update sector's internal time spent counter1
         state.rules.sector.setTimeSpent(internalTimeSpent);
+
+        Log.info(production);
     }
 
     /** Update averages of various stats, updates some special sector logic.
@@ -160,5 +162,9 @@ public class SectorInfo{
 
         /** mean in terms of items produced per refresh rate (currently, per second) */
         public float mean;
+
+        public String toString(){
+            return mean + "";
+        }
     }
 }
diff --git a/core/src/mindustry/io/SaveMeta.java b/core/src/mindustry/io/SaveMeta.java
index 0a3730d8e1..4aeb7d2f99 100644
--- a/core/src/mindustry/io/SaveMeta.java
+++ b/core/src/mindustry/io/SaveMeta.java
@@ -31,6 +31,6 @@ public class SaveMeta{
         this.mods = JsonIO.read(String[].class, tags.get("mods", "[]"));
         this.secinfo = secinfo;
 
-        secinfo.exportRates().each(e -> hasProduction |= e.value > 0.001f);
+        secinfo.production.each((e, amount) -> hasProduction |= amount.mean > 0.001f);
     }
 }
diff --git a/core/src/mindustry/net/Packets.java b/core/src/mindustry/net/Packets.java
index afe4016091..91d5557e52 100644
--- a/core/src/mindustry/net/Packets.java
+++ b/core/src/mindustry/net/Packets.java
@@ -171,9 +171,10 @@ public class Packets{
             TypeIO.writeString(buffer, name);
             TypeIO.writeString(buffer, usid);
 
-            buffer.put(Base64Coder.decode(uuid));
+            byte[] b = Base64Coder.decode(uuid);
+            buffer.put(b);
             CRC32 crc = new CRC32();
-            crc.update(Base64Coder.decode(uuid));
+            crc.update(Base64Coder.decode(uuid), 0, b.length);
             buffer.putLong(crc.getValue());
 
             buffer.put(mobile ? (byte)1 : 0);
diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java
index ec1f9b9b8a..66933a81b2 100644
--- a/core/src/mindustry/ui/dialogs/PlanetDialog.java
+++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java
@@ -44,6 +44,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
     public PlanetDialog(){
         super("", Styles.fullDialog);
 
+        shouldPause = true;
+
         getCell(buttons).padBottom(-4);
         buttons.background(Styles.black).defaults().growX().height(64f).pad(0);
 
diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java
index cb0a3a9b84..a2f6db7d56 100644
--- a/desktop/src/mindustry/desktop/DesktopLauncher.java
+++ b/desktop/src/mindustry/desktop/DesktopLauncher.java
@@ -16,14 +16,12 @@ import mindustry.*;
 import mindustry.core.*;
 import mindustry.desktop.steam.*;
 import mindustry.game.EventType.*;
+import mindustry.gen.*;
 import mindustry.net.*;
 import mindustry.net.Net.*;
 import mindustry.type.*;
-import mindustry.gen.*;
 
 import java.io.*;
-import java.net.*;
-import java.util.*;
 
 import static mindustry.Vars.*;
 
@@ -307,23 +305,7 @@ public class DesktopLauncher extends ClientLauncher{
             }
         }
 
-        try{
-            Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces();
-            NetworkInterface out;
-            for(out = e.nextElement(); (out.getHardwareAddress() == null || out.isVirtual() || !validAddress(out.getHardwareAddress())) && e.hasMoreElements(); out = e.nextElement());
-
-            byte[] bytes = out.getHardwareAddress();
-            byte[] result = new byte[8];
-            System.arraycopy(bytes, 0, result, 0, bytes.length);
-
-            String str = new String(Base64Coder.encode(result));
-
-            if(str.equals("AAAAAAAAAOA=") || str.equals("AAAAAAAAAAA=")) throw new RuntimeException("Bad UUID.");
-
-            return str;
-        }catch(Exception e){
-            return super.getUUID();
-        }
+        return super.getUUID();
     }
 
     private static void message(String message){