Merge branch 'main' into major/2.0.0/1.18

This commit is contained in:
NotMyFault 2021-12-25 17:20:52 +01:00
commit 3b24a8ae8a
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C

View File

@ -437,12 +437,14 @@ public interface Player extends Entity, Actor {
} else {
continue;
}
WorldEdit.getInstance().getExecutorService().submit(() -> {
doc.close(); // Ensure closed before deletion
doc.getFile().delete();
});
}
}
} else if (Settings.settings().CLIPBOARD.DELETE_ON_LOGOUT || Settings.settings().CLIPBOARD.USE_DISK) {
session.setClipboard(null);
WorldEdit.getInstance().getExecutorService().submit(() -> session.setClipboard(null));
}
if (Settings.settings().HISTORY.DELETE_ON_LOGOUT) {
session.clearHistory();