From 0c03c47eb9bb577c25a17140e483e5844d50d240 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 30 Jul 2021 16:26:25 -0400
Subject: [PATCH] Disabled crash sending + arc

---
 core/src/mindustry/net/CrashSender.java              | 12 +++++-------
 .../src/mindustry/ui/dialogs/SettingsMenuDialog.java |  1 +
 gradle.properties                                    |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/src/mindustry/net/CrashSender.java b/core/src/mindustry/net/CrashSender.java
index 1f3720c8ac..75e1b5b2f9 100644
--- a/core/src/mindustry/net/CrashSender.java
+++ b/core/src/mindustry/net/CrashSender.java
@@ -6,19 +6,14 @@ import arc.func.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
-import arc.util.serialization.*;
-import arc.util.serialization.JsonValue.*;
-import arc.util.serialization.JsonWriter.*;
 import mindustry.*;
 import mindustry.core.*;
-import mindustry.gen.*;
 
 import java.io.*;
 import java.text.*;
 import java.util.*;
 
 import static arc.Core.*;
-import static mindustry.Vars.net;
 import static mindustry.Vars.*;
 
 public class CrashSender{
@@ -126,6 +121,9 @@ public class CrashSender{
             }catch(Throwable ignored){
             }
 
+            //disabled until further notice.
+            /*
+
             JsonValue value = new JsonValue(ValueType.object);
 
             boolean fn = netActive, fs = netServer;
@@ -144,7 +142,7 @@ public class CrashSender{
             ex(() -> value.addChild("trace", new JsonValue(parseException(exception))));
             ex(() -> value.addChild("javaVersion", new JsonValue(OS.javaVersion)));
             ex(() -> value.addChild("javaArch", new JsonValue(OS.osArchBits)));
-
+            
             Log.info("Sending crash report.");
 
             //post to crash report URL, exit code indicates send success
@@ -154,7 +152,7 @@ public class CrashSender{
             }).block(r -> {
                 Log.info("Crash sent successfully.");
                 System.exit(1);
-            });
+            });*/
 
             ret();
         }catch(Throwable death){
diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
index 38b6587322..10f399bbe2 100644
--- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -392,6 +392,7 @@ public class SettingsMenuDialog extends Dialog{
             });
 
             Core.graphics.setVSync(Core.settings.getBool("vsync"));
+
             if(Core.settings.getBool("fullscreen")){
                 Core.app.post(() -> Core.graphics.setFullscreenMode(Core.graphics.getDisplayMode()));
             }
diff --git a/gradle.properties b/gradle.properties
index 896a0fed1f..be8f1289e5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,4 +8,4 @@ kapt.include.compile.classpath=false
 kotlin.stdlib.default.dependency=false
 #needed for android compilation
 android.useAndroidX=true
-archash=6181955e8f540af889fe825140285aa26316a810
+archash=1af9470cb128e1039ab18687bc7cebb767af2207