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

Map fix

Browse Source
This commit is contained in:
Anuken
2019-09-08 23:33:21 -04:00
parent 3bac32e04a ec58e868fd
commit b867cdb8b9
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/src/io/anuke/mindustry/AndroidLauncher.java
View File

@@ -69,7 +69,6 @@ public class AndroidLauncher extends AndroidApplication{
@Override @Override
public void showFileChooser(boolean open, String extension, Consumer<FileHandle> cons){ public void showFileChooser(boolean open, String extension, Consumer<FileHandle> cons){
if(VERSION.SDK_INT >= 19){ if(VERSION.SDK_INT >= 19){
Intent intent = new Intent(open ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_CREATE_DOCUMENT); Intent intent = new Intent(open ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_CREATE_DOCUMENT);
intent.addCategory(Intent.CATEGORY_OPENABLE); intent.addCategory(Intent.CATEGORY_OPENABLE);
intent.setType("*/*"); intent.setType("*/*");

5
core/src/io/anuke/mindustry/maps/Maps.java
View File

@@ -189,6 +189,11 @@ public class Maps{
createNewPreview(map, e -> { createNewPreview(map, e -> {
maps.remove(map); maps.remove(map);
try{
map.file.delete();
}catch(Throwable ignored){
}
error[0] = e; error[0] = e;
}); });

2
core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
View File

@@ -61,7 +61,7 @@ public class Router extends Block{
int counter = tile.rotation(); int counter = tile.rotation();
for(int i = 0; i < proximity.size; i++){ for(int i = 0; i < proximity.size; i++){
Tile other = proximity.get((i + counter) % proximity.size); Tile other = proximity.get((i + counter) % proximity.size);
if(tile == from) continue; if(other == from) continue;
if(set) tile.rotation((byte)((tile.rotation() + 1) % proximity.size)); if(set) tile.rotation((byte)((tile.rotation() + 1) % proximity.size));
if(other.block().acceptItem(item, other, Edges.getFacingEdge(tile, other))){ if(other.block().acceptItem(item, other, Edges.getFacingEdge(tile, other))){
return other; return other;