From 3cd30ebbffe1a65054ee82224905a8f15b936714 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Mon, 30 Mar 2020 17:00:41 +0100 Subject: [PATCH] Fix DiskOptimisedClipboard not closing --- .../boydti/fawe/object/clipboard/DiskOptimizedClipboard.java | 3 --- .../worldedit/extent/clipboard/BlockArrayClipboard.java | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java b/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java index 3b21e05d6..c223c58f2 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java @@ -10,7 +10,6 @@ import com.sk89q.jnbt.IntTag; import com.sk89q.jnbt.Tag; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.Entity; -import com.sk89q.worldedit.extension.platform.PlatformCommandManager; import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; @@ -99,7 +98,6 @@ public class DiskOptimizedClipboard extends LinearClipboard implements Closeable } catch (Exception e) { e.printStackTrace(); } - log.warn("Creating new RandomAccessFile: " + file.getPath()); this.braf = new RandomAccessFile(file, "rw"); long fileLength = (long) getVolume() * 2L + (long) HEADER_SIZE; braf.setLength(0); @@ -286,7 +284,6 @@ public class DiskOptimizedClipboard extends LinearClipboard implements Closeable if (byteBuffer != null) { byteBuffer.force(); fileChannel.close(); - log.warn("Closing the RandomAccessFile: " + file.getPath()); braf.close(); //noinspection ResultOfMethodCallIgnored file.setWritable(true); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java index c4f093548..9817dd235 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java @@ -271,6 +271,11 @@ public class BlockArrayClipboard implements Clipboard { return parent; } + @Override + public void close() { + this.parent.close(); + } + /** * Stores entity data. */