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

Fixed some ores not loading in correctly / Conflict check

Browse Source
This commit is contained in:
Anuken
2019-03-12 13:42:20 -04:00
parent 41f734b04d
commit aa69af64fb
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java
View File

@@ -32,8 +32,7 @@ public class MapsDialog extends FloatingDialog{
Map map = MapIO.readMap(file, true);
String name = map.tags.get("name", file.nameWithoutExtension());
//TODO filename conflict, erasure
Map conflict = world.maps.byName(name);
Map conflict = world.maps.all().find(m -> m.fileName().equals(file.nameWithoutExtension()) || m.name().equals(file.name()));
if(conflict != null && !conflict.custom){
ui.showError(Core.bundle.format("editor.import.exists", name));