From 7850e61672b2c63b849fa7823b8a04029e651599 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 26 Jul 2023 10:31:18 -0400
Subject: [PATCH] Misc bugfixes

---
 .../mindustry/ui/dialogs/SettingsMenuDialog.java    |  2 ++
 .../src/mindustry/world/blocks/power/PowerNode.java | 13 ++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
index 4696767493..60280d737d 100644
--- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -180,6 +180,8 @@ public class SettingsMenuDialog extends BaseDialog{
             t.button("@data.import", Icon.download, style, () -> ui.showConfirm("@confirm", "@data.import.confirm", () -> platform.showFileChooser(true, "zip", file -> {
                 try{
                     importData(file);
+                    control.saves.resetSave();
+                    state = new GameState();
                     Core.app.exit();
                 }catch(IllegalArgumentException e){
                     ui.showErrorMessage("@data.invalid");
diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java
index c543a58b03..582a2246a1 100644
--- a/core/src/mindustry/world/blocks/power/PowerNode.java
+++ b/core/src/mindustry/world/blocks/power/PowerNode.java
@@ -405,17 +405,16 @@ public class PowerNode extends PowerBlock{
             }
 
             if(this == other){ //double tapped
-                if(other.power.links.size == 0 || Core.input.shift()){ //find links
-                    int[] total = {0};
+                if(other.power.links.size == 0){ //find links
+                    Seq<Point2> points = new Seq<>();
                     getPotentialLinks(tile, team, link -> {
-                        if(!insulated(this, link) && total[0]++ < maxNodes){
-                            configure(link.pos());
+                        if(!insulated(this, link) && points.size < maxNodes){
+                            points.add(new Point2(link.tileX() - tile.x, link.tileY() - tile.y));
                         }
                     });
+                    configure(points.toArray(Point2.class));
                 }else{ //clear links
-                    while(power.links.size > 0){
-                        configure(power.links.get(0));
-                    }
+                    configure(new Point2[0]);
                 }
                 deselect();
                 return false;