From 1c816be5ce6f25f92994773419db8ecb5224f70d Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 17 Dec 2019 18:15:24 -0500 Subject: [PATCH] Fixed crash occuring with block overload --- .../io/anuke/mindustry/ui/fragments/PlacementFragment.java | 2 +- fastlane/metadata/android/en-US/changelogs/101.1.txt | 7 +++++++ fastlane/metadata/android/en-US/changelogs/29558.txt | 7 +++++++ gradle.properties | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/101.1.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29558.txt diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index 54ebe7b814..2a843fd5b9 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -262,7 +262,7 @@ public class PlacementFragment extends Fragment{ if(!mobile && Core.settings.getBool("blockselectkeys")){ Array blocks = getByCategory(currentCategory); for(int i = 0; i < blocks.size; i++){ - if(blocks.get(i) == lastDisplay){ + if(blocks.get(i) == lastDisplay && (i + 1) / 10 - 1 < blockSelect.length){ keyCombo = Core.bundle.format("placement.blockselectkeys", Core.keybinds.get(blockSelect[currentCategory.ordinal()]).key.toString()) + (i < 10 ? "" : Core.keybinds.get(blockSelect[(i + 1) / 10 - 1]).key.toString() + ",") + Core.keybinds.get(blockSelect[i % 10]).key.toString() + "]"; diff --git a/fastlane/metadata/android/en-US/changelogs/101.1.txt b/fastlane/metadata/android/en-US/changelogs/101.1.txt new file mode 100644 index 0000000000..0f00ca0c5c --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/101.1.txt @@ -0,0 +1,7 @@ +- Added safer mod loading system - errors should no longer crash, but display a log +- Added new Cyrllic font +- Added range display and stats for repair point +- Whitelisted some more classes for scripting +- Fixed scripting not working on some devices [Android] +- Fixed power node desync +- Fixed some blocks not showing up in drill mining list diff --git a/fastlane/metadata/android/en-US/changelogs/29558.txt b/fastlane/metadata/android/en-US/changelogs/29558.txt new file mode 100644 index 0000000000..0f00ca0c5c --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29558.txt @@ -0,0 +1,7 @@ +- Added safer mod loading system - errors should no longer crash, but display a log +- Added new Cyrllic font +- Added range display and stats for repair point +- Whitelisted some more classes for scripting +- Fixed scripting not working on some devices [Android] +- Fixed power node desync +- Fixed some blocks not showing up in drill mining list diff --git a/gradle.properties b/gradle.properties index be68e4ab8e..29c1e50fad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=977a110607c508b1f4a5656ad292497fa21f4726 +archash=88c1a9afe2f5be4dd06e47ac8afe070247b3da29