fix dir

Author: hayanesuru

leaf-server/minecraft-patches/features/0096-Configurable-vanilla-username-check.patch

@@ -18,7 +18,7 @@ index fb585637383db4592f97f0c9040ffa86afb43c6a..5381986c9d283d3b22c59d80acf246da
              String suffix = (split.length > 1 ? split[1] : "").replace(org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, "");
              if (afk) {
 diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 6d320ed179393e47398c44f2ba2b2285016f349e..19a56f8c980f739bff54fb067ccf293286f16faf 100644
+index 6d320ed179393e47398c44f2ba2b2285016f349e..f18f1afe1bfc7516180a917979f3766a34880c53 100644
 --- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -163,11 +163,20 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -50,7 +50,7 @@ index 6d320ed179393e47398c44f2ba2b2285016f349e..19a56f8c980f739bff54fb067ccf2932
                          GameProfile gameprofile = ServerLoginPacketListenerImpl.this.createOfflineProfile(ServerLoginPacketListenerImpl.this.requestedUsername); // Spigot
 +                        // Leaf start - Configurable vanilla username check
 +                        if (org.dreeam.leaf.config.modules.misc.VanillaUsernameCheck.allowOldPlayersJoin) {
-+                            if (server.playerDataStorage.load(gameprofile.getName(), gameprofile.getId().toString(), gameprofile.getId(), net.minecraft.util.ProblemReporter.DISCARDING).orElse(null) != null) {
++                            if (server.playerDataStorage.load(gameprofile.getName(), gameprofile.getId().toString(), net.minecraft.util.ProblemReporter.DISCARDING).orElse(null) != null) {
 +                                server.getPlayerList().playedPlayers.add(packet.name());
 +                            } else if (allPrevChecksPassed) {
 +                                Validate.validState(StringUtil.isReasonablePlayerName(packet.name()), "Invalid characters in username");

leaf-server/minecraft-patches/features/0103-Akarin-Save-Json-list-asynchronously.patch

@@ -8,7 +8,7 @@ Original license: GPL v3
 Original project: https://github.com/Akarin-project/Akarin
 
 diff --git a/net/minecraft/server/players/StoredUserList.java b/net/minecraft/server/players/StoredUserList.java
-index 39483f7b453d6faedeccc1ab1eda76669395ea5a..9b558d6baf4a5ea00dcb4cd9289bbbc6de4a3546 100644
+index 39483f7b453d6faedeccc1ab1eda76669395ea5a..bd48472430a8f183ff331d3a98b4c1720119a082 100644
 --- a/net/minecraft/server/players/StoredUserList.java
 +++ b/net/minecraft/server/players/StoredUserList.java
 @@ -97,6 +97,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
@@ -19,19 +19,16 @@ index 39483f7b453d6faedeccc1ab1eda76669395ea5a..9b558d6baf4a5ea00dcb4cd9289bbbc6
          this.removeExpired(); // Paper - remove expired values before saving
          JsonArray jsonArray = new JsonArray();
          this.map.values().stream().map(storedEntry -> Util.make(new JsonObject(), storedEntry::serialize)).forEach(jsonArray::add);
-@@ -104,10 +105,15 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -104,10 +105,12 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
          try (BufferedWriter writer = Files.newWriter(this.file, StandardCharsets.UTF_8)) {
              GSON.toJson(jsonArray, GSON.newJsonWriter(writer));
          }
-+        return null;
-+        };
-+        org.dreeam.leaf.async.AsyncPlayerDataSaving.submit(saveTask, this.file.toString(), 4);
-+        // Leaf end - Akarin - Save Json list asynchronously
++        return null; }; org.dreeam.leaf.async.AsyncPlayerDataSaving.submit(saveTask, this.file.toPath(), org.dreeam.leaf.config.modules.async.AsyncPlayerDataSave.userList); // Leaf - Akarin - Save Json list asynchronously
      }
 
      public void load() throws IOException {
          if (this.file.exists()) {
-+            org.dreeam.leaf.async.AsyncPlayerDataSaving.submit(null, this.file.toString(), 4); // Leaf - Akarin - Save Json list asynchronously
++            org.dreeam.leaf.async.AsyncPlayerDataSaving.submit(this.file.toPath(), org.dreeam.leaf.config.modules.async.AsyncPlayerDataSave.userList); // Leaf - Akarin - Save Json list asynchronously
              try (BufferedReader reader = Files.newReader(this.file, StandardCharsets.UTF_8)) {
                  this.map.clear();
                  JsonArray jsonArray = GSON.fromJson(reader, JsonArray.class);