From 215cfaa42f745a2112ee91a956403436a65ae2bd Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 1 Oct 2020 16:03:13 -0400 Subject: [PATCH] Fixed #2793 --- core/src/mindustry/content/Blocks.java | 2 +- core/src/mindustry/ui/fragments/BlockConfigFragment.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 93d3c323d6..6226dbae5d 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1526,7 +1526,7 @@ public class Blocks implements ContentList{ force = 4.5f; scaledForce = 5.5f; range = 110f; - damage = 0.1f; + damage = 0.4f; health = 160 * size * size; rotateSpeed = 10; diff --git a/core/src/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/mindustry/ui/fragments/BlockConfigFragment.java index 853c10025e..1523508aa4 100644 --- a/core/src/mindustry/ui/fragments/BlockConfigFragment.java +++ b/core/src/mindustry/ui/fragments/BlockConfigFragment.java @@ -7,6 +7,7 @@ import arc.scene.actions.*; import arc.scene.ui.layout.*; import arc.util.*; import mindustry.content.*; +import mindustry.game.EventType.*; import mindustry.gen.*; import static mindustry.Vars.*; @@ -32,6 +33,11 @@ public class BlockConfigFragment extends Fragment{ } } }); + + Events.on(ResetEvent.class, e -> { + table.visible = false; + configTile = null; + }); } public boolean isShown(){