This commit is contained in:
dordsor21 2021-09-10 17:46:21 +01:00
parent 829ddc393f
commit 470ba64fe4
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
3 changed files with 41 additions and 29 deletions

View File

@ -838,6 +838,17 @@ public class LocalSession implements TextureHolder {
} }
setClipboard(multi); setClipboard(multi);
} }
/**
* Ensure the player's clipboard is closed. (will only do something with clipboard-on-disk)
*/
public void closeClipboard() {
synchronized (clipboardLock) {
if (this.clipboard != null) {
this.clipboard.close();
}
}
}
//FAWE end //FAWE end
/** /**

View File

@ -139,7 +139,7 @@ public class ClipboardCommands {
} }
session.setClipboard(null); session.setClipboard(null);
Clipboard clipboard = new BlockArrayClipboard(region, actor.getUniqueId()); try (Clipboard clipboard = new BlockArrayClipboard(region, actor.getUniqueId())) {
clipboard.setOrigin(centerClipboard ? region.getCenter().toBlockPoint() : session.getPlacementPosition(actor)); clipboard.setOrigin(centerClipboard ? region.getCenter().toBlockPoint() : session.getPlacementPosition(actor));
ForwardExtentCopy copy = new ForwardExtentCopy(editSession, region, clipboard, region.getMinimumPoint()); ForwardExtentCopy copy = new ForwardExtentCopy(editSession, region, clipboard, region.getMinimumPoint());
@ -170,6 +170,7 @@ public class ClipboardCommands {
session.setClipboard(new ClipboardHolder(clipboard)); session.setClipboard(new ClipboardHolder(clipboard));
copy.getStatusMessages().forEach(actor::print); copy.getStatusMessages().forEach(actor::print);
}
//FAWE end //FAWE end
} }

View File

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