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

Flush clipboard rather than close on player disconnect

Browse Source 
Addresses #1291
This commit is contained in:
dordsor21 2021-09-13 15:08:03 +01:00
parent 3088b1245c
commit 06d716248e
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
5 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/LazyClipboardHolder.java
View File

@ -61,4 +61,11 @@ public class LazyClipboardHolder extends URIClipboardHolder {
clipboard = null;
}
@Override
public synchronized void flush() {
if (clipboard instanceof BlockArrayClipboard) {
clipboard.flush();
}
}
}

12
worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/MultiClipboardHolder.java
View File

@ -3,6 +3,7 @@ package com.fastasyncworldedit.core.extent.clipboard;
import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.session.ClipboardHolder;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.HashSet;
@ -183,4 +184,15 @@ public class MultiClipboardHolder extends URIClipboardHolder {
}
}
@Override
public void flush() {
for (ClipboardHolder holder : holders) {
try {
holder.flush();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}

10
worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
View File

@ -840,12 +840,16 @@ public class LocalSession implements TextureHolder {
}
/**
* Ensure the player's clipboard is closed. (will only do something with clipboard-on-disk)
* Ensure the player's clipboard is flushed. (will only do something with clipboard-on-disk)
*/
public void closeClipboard() {
public void flushClipboard() {
synchronized (clipboardLock) {
if (this.clipboard != null) {
this.clipboard.close();
try {
this.clipboard.flush();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}

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

@ -391,7 +391,7 @@ public interface Player extends Entity, Actor {
*/
default void unregister() {
cancel(true);
getSession().closeClipboard();
getSession().flushClipboard();
if (Settings.IMP.HISTORY.DELETE_ON_LOGOUT) {
getSession().clearHistory();
}

13
worldedit-core/src/main/java/com/sk89q/worldedit/session/ClipboardHolder.java
View File

@ -24,6 +24,9 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.math.transform.Identity;
import com.sk89q.worldedit.math.transform.Transform;
import java.io.Closeable;
import java.io.Flushable;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
@ -32,7 +35,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
/**
* Holds the clipboard and the current transform on the clipboard.
*/
public class ClipboardHolder {
//FAWE start - closeable and flushable
public class ClipboardHolder implements Closeable, Flushable {
private Clipboard clipboard;
private Transform transform = new Identity();
@ -118,6 +122,7 @@ public class ClipboardHolder {
return new PasteBuilder(this, targetExtent);
}
@Override
public void close() {
if (clipboard != null) {
clipboard.close();
@ -125,5 +130,11 @@ public class ClipboardHolder {
clipboard = null;
}
@Override
public void flush() throws IOException {
if (clipboard != null) {
clipboard.flush();
}
}
}