From e94e31aedf9b96126b1af598ed2adbb0da01cfbb Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 8 May 2022 09:23:43 -0400
Subject: [PATCH] Fixed #6782 / Fixed #6781 / Fixed #6779

---
 core/src/mindustry/input/InputHandler.java                  | 4 ++++
 core/src/mindustry/world/blocks/defense/turrets/Turret.java | 4 ++--
 core/src/mindustry/world/blocks/production/BeamDrill.java   | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 47ef52ae5e..6e312b19c4 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -590,6 +590,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             logicCutsceneZoom = -1f;
         }
 
+        if(!commandMode){
+            commandRect = false;
+        }
+
         playerPlanTree.clear();
         player.unit().plans.each(playerPlanTree::insert);
 
diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
index 426edb7b0b..b4fc283682 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
@@ -183,12 +183,12 @@ public class Turret extends ReloadTurret{
 
         public float estimateDps(){
             if(!hasAmmo()) return 0f;
-            return shoot.shots / reload * 60f * peekAmmo().estimateDPS() * potentialEfficiency * timeScale;
+            return shoot.shots / reload * 60f * (peekAmmo() == null ? 0f : peekAmmo().estimateDPS()) * potentialEfficiency * timeScale;
         }
 
         @Override
         public float range(){
-            if(hasAmmo()){
+            if(peekAmmo() != null){
                 return range + peekAmmo().rangeChange;
             }
             return range;
diff --git a/core/src/mindustry/world/blocks/production/BeamDrill.java b/core/src/mindustry/world/blocks/production/BeamDrill.java
index 2fa1121640..468641fe7c 100644
--- a/core/src/mindustry/world/blocks/production/BeamDrill.java
+++ b/core/src/mindustry/world/blocks/production/BeamDrill.java
@@ -281,6 +281,8 @@ public class BeamDrill extends Block{
             Draw.rect(block.region, x, y);
             Draw.rect(topRegion, x, y, rotdeg());
 
+            if(isPayload()) return;
+
             var dir = Geometry.d4(rotation);
             int ddx = Geometry.d4x(rotation + 1), ddy = Geometry.d4y(rotation + 1);