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

Don't initialise a DiskOptimisedClipboard before checking for an existing one in the LocalSession when using loadClipboardFromDisk (#1731)

Browse Source
This commit is contained in:
Jordan 2022-05-09 12:50:19 +01:00 committed by GitHub
parent b85888806a
commit 267dc153f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-core/src/main/java/com/sk89q/worldedit/entity/Player.java
View File

@ -463,7 +463,6 @@ public interface Player extends Entity, Actor {
); );
try { try {
if (file.exists() && file.length() > 5) { if (file.exists() && file.length() > 5) {
DiskOptimizedClipboard doc = new DiskOptimizedClipboard(file);
LocalSession session = getSession(); LocalSession session = getSession();
try { try {
if (session.getClipboard() != null) { if (session.getClipboard() != null) {
@ -471,9 +470,10 @@ public interface Player extends Entity, Actor {
} }
} catch (EmptyClipboardException ignored) { } catch (EmptyClipboardException ignored) {
} }
DiskOptimizedClipboard doc = new DiskOptimizedClipboard(file);
Clipboard clip = doc.toClipboard(); Clipboard clip = doc.toClipboard();
ClipboardHolder holder = new ClipboardHolder(clip); ClipboardHolder holder = new ClipboardHolder(clip);
getSession().setClipboard(holder); session.setClipboard(holder);
} }
} catch (FaweClipboardVersionMismatchException e) { } catch (FaweClipboardVersionMismatchException e) {
print(Caption.of("fawe.error.clipboard.on.disk.version.mismatch")); print(Caption.of("fawe.error.clipboard.on.disk.version.mismatch"));