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

Clean up other compiler warnings

Browse Source
This commit is contained in:
Kenzie Togami 2018-12-26 16:50:24 -08:00
parent de7d9421b1
commit 386668d221
No known key found for this signature in database
GPG Key ID: 5D200B325E157A81
4 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -37,6 +37,7 @@ import com.sk89q.worldedit.extension.platform.Actor;
import com.sk89q.worldedit.extension.platform.Capability; import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.extension.platform.Platform;
import com.sk89q.worldedit.extent.inventory.BlockBag; import com.sk89q.worldedit.extent.inventory.BlockBag;
import org.bstats.bukkit.Metrics; import org.bstats.bukkit.Metrics;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -181,41 +182,27 @@ public class WorldEditPlugin extends JavaPlugin implements TabCompleter {
protected void createDefaultConfiguration(String name) { protected void createDefaultConfiguration(String name) {
File actual = new File(getDataFolder(), name); File actual = new File(getDataFolder(), name);
if (!actual.exists()) { if (!actual.exists()) {
InputStream input = null; try (JarFile file = new JarFile(getFile())) {
try {
JarFile file = new JarFile(getFile());
ZipEntry copy = file.getEntry("defaults/" + name); ZipEntry copy = file.getEntry("defaults/" + name);
if (copy == null) throw new FileNotFoundException(); if (copy == null) throw new FileNotFoundException();
input = file.getInputStream(copy); copyDefaultConfig(file.getInputStream(copy), actual, name);
} catch (IOException e) { } catch (IOException e) {
getLogger().severe("Unable to read default configuration: " + name); getLogger().severe("Unable to read default configuration: " + name);
} }
if (input != null) { }
FileOutputStream output = null; }
try { private void copyDefaultConfig(InputStream input, File actual, String name) {
output = new FileOutputStream(actual); try (FileOutputStream output = new FileOutputStream(actual)) {
byte[] buf = new byte[8192]; byte[] buf = new byte[8192];
int length; int length;
while ((length = input.read(buf)) > 0) { while ((length = input.read(buf)) > 0) {
output.write(buf, 0, length); output.write(buf, 0, length);
}
getLogger().info("Default configuration file written: " + name);
} catch (IOException e) {
getLogger().log(Level.WARNING, "Failed to write default config file", e);
} finally {
try {
input.close();
} catch (IOException ignored) {}
try {
if (output != null) {
output.close();
}
} catch (IOException ignored) {}
}
} }
getLogger().info("Default configuration file written: " + name);
} catch (IOException e) {
getLogger().log(Level.WARNING, "Failed to write default config file", e);
} }
} }

2
worldedit-core/src/main/java/com/sk89q/jnbt/ListTagBuilder.java
View File

@ -97,7 +97,7 @@ public class ListTagBuilder {
* *
* @return a new builder * @return a new builder
*/ */
public static <T extends Tag> ListTagBuilder createWith(T ... entries) { public static ListTagBuilder createWith(Tag... entries) {
checkNotNull(entries); checkNotNull(entries);
if (entries.length == 0) { if (entries.length == 0) {

2
worldedit-core/src/main/java/com/sk89q/worldedit/util/FileDialogUtil.java
View File

@ -85,7 +85,7 @@ public final class FileDialogUtil {
if (index == -1 || index == path.length() - 1) { if (index == -1 || index == path.length() - 1) {
return false; return false;
} else { } else {
return exts.contains(path.indexOf(index + 1)); return exts.contains(path.substring(index + 1));
} }
} }

7
worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/Snapshot.java
View File

@ -133,9 +133,10 @@ public class Snapshot implements Comparable<Snapshot> {
public boolean containsWorld(String worldname) { public boolean containsWorld(String worldname) {
try { try {
if (file.getName().toLowerCase().endsWith(".zip")) { if (file.getName().toLowerCase().endsWith(".zip")) {
ZipFile entry = new ZipFile(file); try (ZipFile entry = new ZipFile(file)) {
return (entry.getEntry(worldname) != null return (entry.getEntry(worldname) != null
|| entry.getEntry(worldname + "/level.dat") != null); || entry.getEntry(worldname + "/level.dat") != null);
}
} else if (file.getName().toLowerCase().endsWith(".tar.bz2") } else if (file.getName().toLowerCase().endsWith(".tar.bz2")
|| file.getName().toLowerCase().endsWith(".tar.gz") || file.getName().toLowerCase().endsWith(".tar.gz")
|| file.getName().toLowerCase().endsWith(".tar")) { || file.getName().toLowerCase().endsWith(".tar")) {