Upstream
/
PlotSquared
mirror of https://github.com/IntellectualSites/PlotSquared.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use try with resource to close ClipboardReader and stop adding "atic" to schematic files or not reason

This commit is contained in:
dordsor21 2020-03-26 20:55:27 +00:00
parent f9bf576d2e
commit 2994b2c158
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
View File

@ -282,7 +282,7 @@ public abstract class SchematicHandler {
Settings.Paths.SCHEMATICS + File.separator + name);
if (!file.exists()) {
file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
Settings.Paths.SCHEMATICS + File.separator + name + "atic");
Settings.Paths.SCHEMATICS + File.separator + name);
}
return getSchematic(file);
}
@ -319,18 +319,17 @@ public abstract class SchematicHandler {
if (!file.exists()) {
return null;
}
try {
ClipboardFormat format = ClipboardFormats.findByFile(file);
if (format != null) {
ClipboardReader reader = format.getReader(new FileInputStream(file));
ClipboardFormat format = ClipboardFormats.findByFile(file);
if (format != null) {
try (ClipboardReader reader = format.getReader(new FileInputStream(file))) {
Clipboard clip = reader.read();
return new Schematic(clip);
} else {
throw new UnsupportedFormatException(
"This schematic format is not recognised or supported.");
} catch (IOException e) {
e.printStackTrace();
}
} catch (IOException e) {
e.printStackTrace();
} else {
throw new UnsupportedFormatException(
"This schematic format is not recognised or supported.");
}
return null;
}