Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #2197

Browse Source
This commit is contained in:
Anuken
2020-06-29 21:22:12 -04:00
parent df4278a646
commit c2c0c3fd08
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/editor/MapEditorDialog.java
View File

@@ -234,6 +234,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
show(); show();
state.rules = (lastSavedRules == null ? new Rules() : lastSavedRules); state.rules = (lastSavedRules == null ? new Rules() : lastSavedRules);
lastSavedRules = null; lastSavedRules = null;
saved = false;
editor.renderer().updateAll(); editor.renderer().updateAll();
} }

2
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -76,7 +76,7 @@ public class CoreBlock extends StorageBlock{
new Bar( new Bar(
() -> Core.bundle.format("bar.capacity", ui.formatAmount(e.storageCapacity)), () -> Core.bundle.format("bar.capacity", ui.formatAmount(e.storageCapacity)),
() -> Pal.items, () -> Pal.items,
() -> e.items().total() / ((float)e.storageCapacity * content.items().size) () -> e.items().total() / ((float)e.storageCapacity * content.items().count(i -> i.unlockedNow()))
)); ));
bars.add("units", e -> bars.add("units", e ->

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=9e073900d360393ecbd369cce736fdbc035b9e38 archash=6a8eb57007ff1b0ae465fbfe9983edb585964823