From ee28f4564b4640fe74c86a50e3c5b2d27fed0f3c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 1 Dec 2020 08:39:16 -0500
Subject: [PATCH] Final bugfixes

---
 core/src/mindustry/content/Blocks.java                      | 2 ++
 core/src/mindustry/ui/dialogs/PlanetDialog.java             | 2 +-
 core/src/mindustry/world/blocks/defense/turrets/Turret.java | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index b324b24190..21165bac79 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1768,6 +1768,8 @@ public class Blocks implements ContentList{
             }}
             );
 
+            maxAmmo = 40;
+            ammoPerShot = 4;
             rotateSpeed = 2.5f;
             reloadTime = 200f;
             ammoUseEffect = Fx.casing3Double;
diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java
index 4a96776cf6..6b62f216d3 100644
--- a/core/src/mindustry/ui/dialogs/PlanetDialog.java
+++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java
@@ -722,7 +722,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
 
         stable.row();
 
-        if(sector.save != null){
+        if(sector.hasBase()){
             stable.button("@stats", Icon.info, Styles.transt, () -> showStats(sector)).height(40f).fillX().row();
         }
 
diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
index 4409fa6533..ee9553237e 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
@@ -345,7 +345,11 @@ public class Turret extends ReloadTurret{
 
         /** @return  whether the turret has ammo. */
         public boolean hasAmmo(){
-            return ammo.size > 0 && ammo.peek().amount >= 1;
+            //skip first entry if it has less than the required amount of ammo
+            if(ammo.size >= 2 && ammo.peek().amount < ammoPerShot){
+                ammo.pop();
+            }
+            return ammo.size > 0 && ammo.peek().amount >= ammoPerShot;
         }
 
         protected void updateShooting(){