mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-12-22 17:27:38 +00:00
Don't initialise a DiskOptimisedClipboard before checking for an existing one in the LocalSession when using loadClipboardFromDisk (#1731)
This commit is contained in:
parent
b85888806a
commit
267dc153f0
@ -463,7 +463,6 @@ public interface Player extends Entity, Actor {
|
||||
);
|
||||
try {
|
||||
if (file.exists() && file.length() > 5) {
|
||||
DiskOptimizedClipboard doc = new DiskOptimizedClipboard(file);
|
||||
LocalSession session = getSession();
|
||||
try {
|
||||
if (session.getClipboard() != null) {
|
||||
@ -471,9 +470,10 @@ public interface Player extends Entity, Actor {
|
||||
}
|
||||
} catch (EmptyClipboardException ignored) {
|
||||
}
|
||||
DiskOptimizedClipboard doc = new DiskOptimizedClipboard(file);
|
||||
Clipboard clip = doc.toClipboard();
|
||||
ClipboardHolder holder = new ClipboardHolder(clip);
|
||||
getSession().setClipboard(holder);
|
||||
session.setClipboard(holder);
|
||||
}
|
||||
} catch (FaweClipboardVersionMismatchException e) {
|
||||
print(Caption.of("fawe.error.clipboard.on.disk.version.mismatch"));
|
||||
|
Loading…
Reference in New Issue
Block a user