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

Fixed crash occuring with block overload

Browse Source
This commit is contained in:
Anuken
2019-12-17 18:15:24 -05:00
parent f504dd2b5a
commit 1c816be5ce
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -262,7 +262,7 @@ public class PlacementFragment extends Fragment{
if(!mobile && Core.settings.getBool("blockselectkeys")){ if(!mobile && Core.settings.getBool("blockselectkeys")){
Array<Block> blocks = getByCategory(currentCategory); Array<Block> blocks = getByCategory(currentCategory);
for(int i = 0; i < blocks.size; i++){ 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()) 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() + ",") + (i < 10 ? "" : Core.keybinds.get(blockSelect[(i + 1) / 10 - 1]).key.toString() + ",")
+ Core.keybinds.get(blockSelect[i % 10]).key.toString() + "]"; + Core.keybinds.get(blockSelect[i % 10]).key.toString() + "]";

7
fastlane/metadata/android/en-US/changelogs/101.1.txt Normal file
View File

@@ -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

7
fastlane/metadata/android/en-US/changelogs/29558.txt Normal file
View File

@@ -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

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=977a110607c508b1f4a5656ad292497fa21f4726 archash=88c1a9afe2f5be4dd06e47ac8afe070247b3da29