diff --git a/src/main/java/com/sk89q/wepif/FlatFilePermissionsResolver.java b/src/main/java/com/sk89q/wepif/FlatFilePermissionsResolver.java index 15fb3e751..aca21f199 100644 --- a/src/main/java/com/sk89q/wepif/FlatFilePermissionsResolver.java +++ b/src/main/java/com/sk89q/wepif/FlatFilePermissionsResolver.java @@ -69,11 +69,11 @@ public static boolean filesExists() { public Map> loadGroupPermissions() { Map> userGroupPermissions = new HashMap>(); - FileReader input = null; + BufferedReader buff = null; try { - input = new FileReader(this.groupFile); - BufferedReader buff = new BufferedReader(input); + FileReader input = new FileReader(this.groupFile); + buff = new BufferedReader(input); String line; while ((line = buff.readLine()) != null) { @@ -101,8 +101,8 @@ public Map> loadGroupPermissions() { e.printStackTrace(); } finally { try { - if (input != null) { - input.close(); + if (buff != null) { + buff.close(); } } catch (IOException e2) { } @@ -122,11 +122,11 @@ public void load() { defaultPermissionsCache = userGroupPermissions.get("default"); } - FileReader input = null; + BufferedReader buff = null; try { - input = new FileReader(this.userFile); - BufferedReader buff = new BufferedReader(input); + FileReader input = new FileReader(this.userFile); + buff = new BufferedReader(input); String line; while ((line = buff.readLine()) != null) { @@ -166,8 +166,8 @@ public void load() { e.printStackTrace(); } finally { try { - if (input != null) { - input.close(); + if (buff != null) { + buff.close(); } } catch (IOException e2) { } diff --git a/src/main/java/com/sk89q/worldedit/data/LegacyChunkStore.java b/src/main/java/com/sk89q/worldedit/data/LegacyChunkStore.java index 3c6e8b43c..2107404db 100644 --- a/src/main/java/com/sk89q/worldedit/data/LegacyChunkStore.java +++ b/src/main/java/com/sk89q/worldedit/data/LegacyChunkStore.java @@ -120,7 +120,7 @@ public CompoundTag getChunkTag(Vector2D pos, LocalWorld world) return rootTag; } finally { - stream.close(); + nbt.close(); } } diff --git a/src/main/java/com/sk89q/worldedit/data/McRegionChunkStore.java b/src/main/java/com/sk89q/worldedit/data/McRegionChunkStore.java index 8bbb75b0a..58c161f7b 100644 --- a/src/main/java/com/sk89q/worldedit/data/McRegionChunkStore.java +++ b/src/main/java/com/sk89q/worldedit/data/McRegionChunkStore.java @@ -104,7 +104,7 @@ public CompoundTag getChunkTag(Vector2D pos, LocalWorld world) throws DataExcept return rootTag; } finally { - stream.close(); + nbt.close(); } } diff --git a/src/main/java/com/sk89q/worldedit/schematic/MCEditSchematicFormat.java b/src/main/java/com/sk89q/worldedit/schematic/MCEditSchematicFormat.java index 36c16d9be..16ea19697 100644 --- a/src/main/java/com/sk89q/worldedit/schematic/MCEditSchematicFormat.java +++ b/src/main/java/com/sk89q/worldedit/schematic/MCEditSchematicFormat.java @@ -68,6 +68,7 @@ public CuboidClipboard load(File file) throws IOException, DataException { // Schematic tag CompoundTag schematicTag = (CompoundTag) nbtStream.readTag(); + nbtStream.close(); if (!schematicTag.getName().equals("Schematic")) { throw new DataException("Tag \"Schematic\" does not exist or is not first"); }