Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correctly resolve file if extension is given (#2857)

Browse Source 
* fix: correctly resolve file if extension is given

* Adjust error if ClipboardFormats#findByFile null
This commit is contained in:
Jordan 2024-07-31 21:08:06 +02:00 committed by GitHub
parent 638344d815
commit f93ad596c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MainUtil.java
View File

@ -712,6 +712,12 @@ public class MainUtil {
return file; return file;
} }
} }
if (filename.matches(".*\\.[\\w].*")) {
File file = MainUtil.resolveRelative(new File(dir, filename));
if (file.exists()) {
return file;
}
}
for (ClipboardFormat f : ClipboardFormats.getAll()) { for (ClipboardFormat f : ClipboardFormats.getAll()) {
File file = MainUtil.resolveRelative(new File(dir, filename + "." + f.getPrimaryFileExtension())); File file = MainUtil.resolveRelative(new File(dir, filename + "." + f.getPrimaryFileExtension()));
if (file.exists()) { if (file.exists()) {

6
worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
View File

@ -401,7 +401,11 @@ public class SchematicCommands {
if (format == null) { if (format == null) {
format = ClipboardFormats.findByFile(file); format = ClipboardFormats.findByFile(file);
if (format == null) { if (format == null) {
actor.print(Caption.of("worldedit.schematic.unknown-format", TextComponent.of(formatName))); if (noExplicitFormat) {
actor.print(Caption.of("fawe.worldedit.schematic.schematic.load-failure", TextComponent.of(file.getName())));
} else {
actor.print(Caption.of("worldedit.schematic.unknown-format", TextComponent.of(formatName)));
}
return; return;
} }
} }

1
worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormats.java
View File

@ -208,7 +208,6 @@ public class ClipboardFormats {
} }
} }
return null; return null;
} }
public static MultiClipboardHolder loadAllFromInput( public static MultiClipboardHolder loadAllFromInput(