From 0678592d59d2012cd500b9eaee9af084390810e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D1=80=D0=BA=D0=BD=D0=B5=D1=81=D1=81=233729?=
 <79508138+Darkness6030@users.noreply.github.com>
Date: Sat, 14 Jan 2023 00:51:36 +0300
Subject: [PATCH] Fix cheaty item and liquid turrets (#8176)

* Update Turret.java

* Update TractorBeamTurret.java

* Update TractorBeamTurret.java

* Update ItemTurret.java

* Update LiquidTurret.java
---
 .../world/blocks/defense/turrets/ItemTurret.java       |  2 +-
 .../world/blocks/defense/turrets/LiquidTurret.java     | 10 ++++++++++
 .../mindustry/world/blocks/defense/turrets/Turret.java |  3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
index 54ec745bec..12489766c4 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
@@ -88,7 +88,7 @@ public class ItemTurret extends Turret{
             super.onProximityAdded();
 
             //add first ammo item to cheaty blocks so they can shoot properly
-            if(cheating() && ammo.size > 0){
+            if(cheating() && ammoTypes.size > 0){
                 handleItem(this, ammoTypes.entries().next().key);
             }
         }
diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
index c0087eee5f..5f3198ecba 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
@@ -59,6 +59,16 @@ public class LiquidTurret extends Turret{
     }
 
     public class LiquidTurretBuild extends TurretBuild{
+        
+        @Override
+        public void onProximityAdded(){
+            super.onProximityAdded();
+
+            //add first ammo liquid to cheaty blocks so they can shoot properly
+            if(cheating() && ammoTypes.size > 0){
+                handleLiquid(this, ammoTypes.entries().next().key, 1f);
+            }
+        }
 
         @Override
         public boolean shouldActiveSound(){
diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
index 2209cb640c..b833fccf18 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
@@ -500,7 +500,8 @@ public class Turret extends ReloadTurret{
             if(ammo.size >= 2 && ammo.peek().amount < ammoPerShot && ammo.get(ammo.size - 2).amount >= ammoPerShot){
                 ammo.swap(ammo.size - 1, ammo.size - 2);
             }
-            return ammo.size > 0 && ammo.peek().amount >= ammoPerShot;
+            
+            return ammo.size > 0 && ammo.peek().amount >= ammoPerShot || cheating();
         }
 
         public boolean charging(){