From 8609400d766349155f22fda785f95bbd6835766c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 27 Sep 2019 20:39:30 -0400
Subject: [PATCH] Ask players if they want to make games public

---
 core/assets/bundles/bundle.properties                    | 1 +
 core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java   | 9 +++++++++
 .../anuke/mindustry/world/blocks/units/UnitFactory.java  | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 4f0f08f9e3..8805c5f2fb 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -573,6 +573,7 @@ setting.savecreate.name = Auto-Create Saves
 setting.publichost.name = Public Game Visibility
 setting.chatopacity.name = Chat Opacity
 setting.playerchat.name = Display Player Bubble Chat
+public.confirm = Do you want to make your game public?\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility.
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds...
 uiscale.cancel = Cancel & Exit
 setting.bloom.name = Bloom
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
index a7e82e0c75..8391135c22 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
@@ -67,6 +67,15 @@ public class HostDialog extends FloatingDialog{
             try{
                 net.host(Vars.port);
                 player.isAdmin = true;
+
+                if(steam){
+                    Core.app.post(() -> Core.settings.getBoolOnce("steampublic", () -> {
+                        ui.showConfirm("$setting.publichost.name", "$public.confirm", () -> {
+                            Core.settings.putSave("publichost", true);
+                            platform.updateLobby();
+                        });
+                    }));
+                }
             }catch(IOException e){
                 ui.showException("$server.error", e);
             }
diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
index 9de6fc9235..07877ccb43 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
@@ -190,6 +190,11 @@ public class UnitFactory extends Block{
         return entity.spawned < maxSpawn;
     }
 
+    @Override
+    public boolean shouldConsume(Tile tile){
+        return canProduce(tile);
+    }
+
     public static class UnitFactoryEntity extends TileEntity{
         float buildTime;
         float time;