From 7dcfd648f75bce77c18d860f5631e6f2c59bafb3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 9 Jun 2021 08:37:26 -0400
Subject: [PATCH] Minor bugfixes

---
 core/src/mindustry/input/InputHandler.java    | 26 ++++++++++---------
 .../blocks/experimental/BlockUnloader.java    |  5 ++++
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index f30cf1333b..073550efd0 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -131,22 +131,24 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
     @Remote(called = Loc.both, targets = Loc.both, forward = true, unreliable = true)
     public static void deletePlans(Player player, int[] positions){
-        if(netServer.admins.allowAction(player, ActionType.removePlanned, a -> a.plans = positions)){
+        if(net.server() && !netServer.admins.allowAction(player, ActionType.removePlanned, a -> a.plans = positions)){
+            throw new ValidateException(player, "Player cannot remove plans.");
+        }
 
-            var it = player.team().data().blocks.iterator();
-            //O(n^2) search here; no way around it
-            outer:
-            while(it.hasNext()){
-                BlockPlan req = it.next();
+        if(player == null) return;
 
-                for(int pos : positions){
-                    if(req.x == Point2.x(pos) && req.y == Point2.y(pos)){
-                        it.remove();
-                        continue outer;
-                    }
+        var it = player.team().data().blocks.iterator();
+        //O(n^2) search here; no way around it
+        outer:
+        while(it.hasNext()){
+            BlockPlan req = it.next();
+
+            for(int pos : positions){
+                if(req.x == Point2.x(pos) && req.y == Point2.y(pos)){
+                    it.remove();
+                    continue outer;
                 }
             }
-
         }
     }
 
diff --git a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
index cdb3681ae9..53d4df1b66 100644
--- a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
+++ b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
@@ -16,6 +16,11 @@ public class BlockUnloader extends BlockLoader{
         return true;
     }
 
+    @Override
+    public boolean rotatedOutput(int x, int y){
+        return false;
+    }
+
     public class BlockUnloaderBuild extends BlockLoaderBuild{
 
         @Override