Merge pull request #9 from IronApollo/master

Fixes some schematic files not being found with proper input
This commit is contained in:
Jesse Boyd 2018-10-14 23:01:33 +11:00 committed by GitHub
commit 9aaa77094e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -354,11 +354,21 @@ public enum ClipboardFormat {
dir = new File(dir + "." + getExtension());
}
}
if(!dir.exists()) {
for(ClipboardFormat format : values) {
if(new File(working, (Settings.IMP.PATHS.PER_PLAYER_SCHEMATICS ? (player.getUniqueId().toString() + File.separator) : "") + input + "." + format.getExtension()).exists()) {
return format.loadAllFromInput(player, input, message);
}
}
}
if (!dir.exists()) {
if (message) BBC.SCHEMATIC_NOT_FOUND.send(player, input);
return null;
}
if (!dir.isDirectory()) {
if(!findByFile(dir).getExtension().equals(getExtension())) {
return findByFile(dir).loadAllFromInput(player, input, message);
}
ByteSource source = Files.asByteSource(dir);
URI uri = dir.toURI();
return new MultiClipboardHolder(uri, new LazyClipboardHolder(dir.toURI(), source, this, null));