From 909c64468f26d4e78603272bcf92ae64b686c682 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 4 Aug 2021 09:26:39 -0400
Subject: [PATCH] Fixed #5695 / Fixed #5697

---
 core/src/mindustry/ui/dialogs/PlanetDialog.java            | 7 ++++---
 .../mindustry/world/blocks/campaign/PayloadLaunchPad.java  | 7 -------
 gradle.properties                                          | 2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java
index 7dfae6246a..851ecd52df 100644
--- a/core/src/mindustry/ui/dialogs/PlanetDialog.java
+++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java
@@ -769,10 +769,11 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
 
                             t.button(Icon.none, Styles.clearTogglei, () -> {
                                 sector.info.icon = null;
+                                sector.info.contentIcon = null;
                                 sector.saveInfo();
                                 hide();
                                 updateSelected();
-                            }).checked(sector.info.icon == null);
+                            }).checked(sector.info.icon == null && sector.info.contentIcon == null);
 
                             int cols = (int)Math.min(20, Core.graphics.getWidth() / Scl.scl(52f));
 
@@ -780,7 +781,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                             for(var key : defaultIcons){
                                 var value = Icon.icons.get(key);
 
-                                t.button(value, Styles.cleari, () -> {
+                                t.button(value, Styles.clearTogglei, () -> {
                                     sector.info.icon = key;
                                     sector.info.contentIcon = null;
                                     sector.saveInfo();
@@ -799,7 +800,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                                 i = 0;
                                 for(UnlockableContent u : content.getBy(ctype).<UnlockableContent>as()){
                                     if(!u.isHidden() && u.unlocked()){
-                                        t.button(new TextureRegionDrawable(u.uiIcon), Styles.cleari, iconMed, () -> {
+                                        t.button(new TextureRegionDrawable(u.uiIcon), Styles.clearTogglei, iconMed, () -> {
                                             sector.info.icon = null;
                                             sector.info.contentIcon = u;
                                             sector.saveInfo();
diff --git a/core/src/mindustry/world/blocks/campaign/PayloadLaunchPad.java b/core/src/mindustry/world/blocks/campaign/PayloadLaunchPad.java
index e5acad5bf7..3c8cf9481f 100644
--- a/core/src/mindustry/world/blocks/campaign/PayloadLaunchPad.java
+++ b/core/src/mindustry/world/blocks/campaign/PayloadLaunchPad.java
@@ -21,7 +21,6 @@ import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.blocks.payloads.*;
-import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
@@ -61,12 +60,6 @@ public class PayloadLaunchPad extends PayloadBlock{
             return !state.isCampaign() || net.client() ? SystemCursor.arrow : super.getCursor();
         }
 
-        //cannot be disabled
-        @Override
-        public float efficiency(){
-            return power != null && (block.consumes.has(ConsumeType.power) && !block.consumes.getPower().buffered) ? power.status : 1f;
-        }
-
         @Override
         public boolean shouldConsume(){
             return true;
diff --git a/gradle.properties b/gradle.properties
index 1068749d98..78ea9e6fbc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,4 +8,4 @@ kapt.include.compile.classpath=false
 kotlin.stdlib.default.dependency=false
 #needed for android compilation
 android.useAndroidX=true
-archash=6c4631e2c715e93e10f96a258c307efbaf2564d3
+archash=99749ad616e38f96932f863f284c3966c423855b