From 999cc9c65156da88bf7669afc088374b5dc90335 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 9 Dec 2020 14:02:38 -0500
Subject: [PATCH] Fixed #3890

---
 core/src/mindustry/ui/dialogs/PlanetDialog.java          | 2 +-
 .../world/blocks/production/LiquidConverter.java         | 6 +++++-
 desktop/src/mindustry/desktop/steam/SStats.java          | 9 ++-------
 fastlane/metadata/android/en-US/changelogs/29772.txt     | 8 ++++++++
 4 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/29772.txt

diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java
index 7074c89a7d..76f5c95daa 100644
--- a/core/src/mindustry/ui/dialogs/PlanetDialog.java
+++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java
@@ -413,7 +413,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                     public void tap(InputEvent event, float x, float y, int count, KeyCode button){
                         if(showing()) return;
 
-                        if(selected == hovered && count == 2){
+                        if(hovered != null && selected == hovered && count == 2){
                             playSelected();
                         }
 
diff --git a/core/src/mindustry/world/blocks/production/LiquidConverter.java b/core/src/mindustry/world/blocks/production/LiquidConverter.java
index 26615718d1..3ea25117e0 100644
--- a/core/src/mindustry/world/blocks/production/LiquidConverter.java
+++ b/core/src/mindustry/world/blocks/production/LiquidConverter.java
@@ -17,7 +17,11 @@ public class LiquidConverter extends GenericCrafter{
 
     @Override
     public void init(){
-        ConsumeLiquidBase cl = consumes.get(ConsumeType.liquid);
+        if(!consumes.has(ConsumeType.liquid) || !(consumes.get(ConsumeType.liquid) instanceof ConsumeLiquid)){
+            throw new RuntimeException("LiquidsConverters must have a ConsumeLiquid. Note that filters are not supported.");
+        }
+
+        ConsumeLiquid cl = consumes.get(ConsumeType.liquid);
         cl.update(false);
         outputLiquid.amount = cl.amount;
         super.init();
diff --git a/desktop/src/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java
index 4111c09894..8a12821056 100644
--- a/desktop/src/mindustry/desktop/steam/SStats.java
+++ b/desktop/src/mindustry/desktop/steam/SStats.java
@@ -1,7 +1,6 @@
 package mindustry.desktop.steam;
 
 import arc.*;
-import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
 import com.codedisaster.steamworks.*;
@@ -78,7 +77,7 @@ public class SStats implements SteamUserStatsCallback{
     private void registerEvents(){
 
         Events.on(UnitDestroyEvent.class, e -> {
-            if(ncustom()){
+            if(campaign()){
                 if(e.unit.team != Vars.player.team()){
                     SStat.unitsDestroyed.add();
 
@@ -253,7 +252,7 @@ public class SStats implements SteamUserStatsCallback{
         });
 
         Events.on(WaveEvent.class, e -> {
-            if(ncustom()){
+            if(campaign()){
                 SStat.maxWavesSurvived.max(Vars.state.wave);
 
                 if(state.stats.buildingsBuilt == 0 && state.wave >= 10){
@@ -326,10 +325,6 @@ public class SStats implements SteamUserStatsCallback{
         });
     }
 
-    private boolean ncustom(){
-        return campaign();
-    }
-
     private boolean campaign(){
         return Vars.state.isCampaign();
     }
diff --git a/fastlane/metadata/android/en-US/changelogs/29772.txt b/fastlane/metadata/android/en-US/changelogs/29772.txt
new file mode 100644
index 0000000000..46192a9571
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/29772.txt
@@ -0,0 +1,8 @@
+[This is a truncated changelog, see Github for full notes]
+- Slightly increased Lancer build cost
+- Double-tapping now enters a campaign map (Contributed by @joshuaptfan)
+- Minor logic memory optimizations - block/sensor constants are no longer stored in every processor
+- Doubled surge smelter item capacity
+- Made Fungal Pass slightly easier
+- Fixed some rare crashes
+- Fixed unit spawn shockwave appearing too late