Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00
Code Issues Releases Activity

1.20.2

Browse Source
This commit is contained in:
Dreeam
2023-09-25 02:56:54 -04:00
parent 78531a5405
commit ecb834ec0d
38 changed files with 1642 additions and 2063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
patches/server/0022-Akarin-Save-Json-list-asynchronously.patch
View File

@@ -8,7 +8,7 @@ Original license: GPL v3
Original project: https://github.com/Akarin-project/Akarin
diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
index 59205dd87c114685f4efe9249d2f65442be36a96..623eed47022eb89b706a5771d2a3b2da6d0b3e94 100644
index ac64513e989500e76f8b0689dae655bcfc7f5b53..2be0b802bf03f6952334928464094bf6932eff6a 100644
--- a/src/main/java/net/minecraft/server/players/StoredUserList.java
+++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
@@ -25,6 +25,7 @@ import java.util.stream.Stream;
@@ -32,20 +32,27 @@ index 59205dd87c114685f4efe9249d2f65442be36a96..623eed47022eb89b706a5771d2a3b2da
+ JsonArray jsonarray = new JsonArray();
+ Stream<JsonObject> stream = this.map.values().stream().map((jsonlistentry) -> { // CraftBukkit - decompile error
+ JsonObject jsonobject = new JsonObject();
+
- Objects.requireNonNull(jsonlistentry);
- return (JsonObject) Util.make(jsonobject, jsonlistentry::serialize);
- });
+ Objects.requireNonNull(jsonlistentry);
+ return (JsonObject) Util.make(jsonobject, jsonlistentry::serialize);
+ });
+
- Objects.requireNonNull(jsonarray);
- stream.forEach(jsonarray::add);
- BufferedWriter bufferedwriter = Files.newWriter(this.file, StandardCharsets.UTF_8);
+ Objects.requireNonNull(jsonarray);
+ stream.forEach(jsonarray::add);
+ try {
+ BufferedWriter bufferedwriter = Files.newWriter(this.file, StandardCharsets.UTF_8);
- Objects.requireNonNull(jsonlistentry);
- return (JsonObject) Util.make(jsonobject, jsonlistentry::serialize);
- });
+ try {
- try {
- StoredUserList.GSON.toJson(jsonarray, bufferedwriter);
- } catch (Throwable throwable) {
- if (bufferedwriter != null) {
try {
+ StoredUserList.GSON.toJson(jsonarray, bufferedwriter);
+ } catch (Throwable throwable) {
+ if (bufferedwriter != null) {
@@ -55,18 +62,10 @@ index 59205dd87c114685f4efe9249d2f65442be36a96..623eed47022eb89b706a5771d2a3b2da
+ throwable.addSuppressed(throwable1);
+ }
+ }
- Objects.requireNonNull(jsonarray);
- stream.forEach(jsonarray::add);
- BufferedWriter bufferedwriter = Files.newWriter(this.file, StandardCharsets.UTF_8);
+
+ throw throwable;
+ }
- try {
- StoredUserList.GSON.toJson(jsonarray, bufferedwriter);
- } catch (Throwable throwable) {
- if (bufferedwriter != null) {
- try {
+
+ if (bufferedwriter != null) {
bufferedwriter.close();
- } catch (Throwable throwable1) {