From 2d9204d638dc12e0a4d7a31e3c8a9d347d2f319b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 13 Jun 2021 19:27:28 -0400
Subject: [PATCH] I guess everything is unsafe now

---
 core/src/mindustry/ui/dialogs/ModsDialog.java | 26 +++++--------------
 .../world/blocks/distribution/MassDriver.java |  2 +-
 .../blocks/payloads/PayloadMassDriver.java    |  1 +
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java
index 44ebebe8ae..ca5ff1fcf8 100644
--- a/core/src/mindustry/ui/dialogs/ModsDialog.java
+++ b/core/src/mindustry/ui/dialogs/ModsDialog.java
@@ -174,21 +174,12 @@ public class ModsDialog extends BaseDialog{
                         dialog.hide();
 
                         platform.showMultiFileChooser(file -> {
-                            Runnable go = () -> {
-                                try{
-                                    mods.importMod(file);
-                                    setup();
-                                }catch(IOException e){
-                                    ui.showException(e);
-                                    e.printStackTrace();
-                                }
-                            };
-
-                            //show unsafe jar file warning
-                            if(file.extEquals("jar")){
-                                ui.showConfirm("@warning", "@mod.jarwarn", go);
-                            }else{
-                                go.run();
+                            try{
+                                mods.importMod(file);
+                                setup();
+                            }catch(IOException e){
+                                ui.showException(e);
+                                Log.err(e);
                             }
                         }, "zip", "jar");
                     }).margin(12f);
@@ -529,10 +520,7 @@ public class ModsDialog extends BaseDialog{
 
     private void githubImportMod(String repo, boolean isJava){
         if(isJava){
-            ui.showConfirm("@warning", "@mod.jarwarn", () -> {
-                ui.loadfrag.show();
-                githubImportJavaMod(repo);
-            });
+            githubImportJavaMod(repo);
         }else{
             ui.loadfrag.show();
             Core.net.httpGet(ghApi + "/repos/" + repo, res -> {
diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java
index 94b993aa7f..045d61736f 100644
--- a/core/src/mindustry/world/blocks/distribution/MassDriver.java
+++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java
@@ -324,7 +324,7 @@ public class MassDriver extends Block{
         }
 
         protected boolean shooterValid(Building other){
-            return other instanceof MassDriverBuild entity && other.consValid() && entity.block == block && entity.link == pos() && within(other, range);
+            return other instanceof MassDriverBuild entity && other.isValid() && other.consValid() && entity.block == block && entity.link == pos() && within(other, range);
         }
 
         protected boolean linkValid(){
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
index 3bf83976ec..0d1821c2f6 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
@@ -184,6 +184,7 @@ public class PayloadMassDriver extends PayloadBlock{
             if(current != null &&
                 !(
                     current instanceof PayloadDriverBuild entity &&
+                    current.isValid() &&
                     entity.consValid() && entity.block == block &&
                     entity.link == pos() && within(current, range)
                 )){