Upstream
/
WorldBorder
mirror of https://github.com/Brettflan/WorldBorder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for fill and trim commands not working on newer 1.2+ worlds due to new region file type

This commit is contained in:
Brettflan 2012-03-03 07:04:56 -06:00
parent 8bfb1c7894
commit d1cffa5cff
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/wimbli/WorldBorder/WorldFileData.java
View File

@ -47,12 +47,17 @@ public class WorldFileData
}
}
}
newData.regionFiles = newData.regionFolder.listFiles(new RegionFileFilter());
// Accepted region file formats: MCR is from late beta versions through 1.1, MCA is from 1.2+
newData.regionFiles = newData.regionFolder.listFiles(new ExtFileFilter(".MCA"));
if (newData.regionFiles == null || newData.regionFiles.length == 0)
{
newData.sendMessage("Could not find any region files. Looked in: "+newData.regionFolder.getPath());
return null;
newData.regionFiles = newData.regionFolder.listFiles(new ExtFileFilter(".MCR"));
if (newData.regionFiles == null || newData.regionFiles.length == 0)
{
newData.sendMessage("Could not find any region files. Looked in: "+newData.regionFolder.getPath());
return null;
}
}
return newData;
@ -191,6 +196,7 @@ public class WorldFileData
data.set(j, true);
counter++;
}
regionData.close();
}
catch (FileNotFoundException ex)
{
@ -214,16 +220,22 @@ public class WorldFileData
notifyPlayer.sendMessage("[WorldData] " + text);
}
// filter for region files
private static class RegionFileFilter implements FileFilter
// file filter used for region files
private static class ExtFileFilter implements FileFilter
{
String ext;
public ExtFileFilter(String extension)
{
this.ext = extension.toLowerCase();
}
@Override
public boolean accept(File file)
{
return (
file.exists()
&& file.isFile()
&& file.getName().toLowerCase().endsWith(".mcr")
&& file.getName().toLowerCase().endsWith(ext)
);
}
}