From 04f0f9d55e6ad258bf887edf8e30c3d202bf499d Mon Sep 17 00:00:00 2001
From: violetc <58360096+s-yh-china@users.noreply.github.com>
Date: Wed, 22 Jun 2022 08:01:14 +0000
Subject: [PATCH] Update Paper

---
 gradle.properties                              |  4 ++--
 patches/api/0001-Leaves-Server-Config.patch    |  4 ++--
 patches/server/0001-Build-changes.patch        |  8 ++++----
 patches/server/0003-Leaves-Server-Config.patch | 12 ++++++------
 patches/server/0008-Add-Leaves-Command.patch   |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f890dfc6..a4edd5d7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,6 +2,6 @@ group = top.leavesmc.leaves
 version = 1.19-R0.1-SNAPSHOT
 
 mcVersion = 1.19
-packageVersion = 1_18_R0
+packageVersion = 1_19_R0
 org.gradle.jvmargs=-Xmx2G
-paperRef=b0eb4e0c7497836bf4fd8a1bfabb822ff2f1c24f
+paperRef=4c9317c9fbbb4f2107c754032646bc905955c727
diff --git a/patches/api/0001-Leaves-Server-Config.patch b/patches/api/0001-Leaves-Server-Config.patch
index 566a434a..9202230f 100644
--- a/patches/api/0001-Leaves-Server-Config.patch
+++ b/patches/api/0001-Leaves-Server-Config.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 79b26045a68ebb9b01e5bd06abbccaaef5489777..e31d63fdf14f63e58476601d0e90fc53fb8335ef 100644
+index e756edf56995f4552387c2e1082307eb3dd48bb3..acffe17834c4671c98160c00e389a0dc275e1888 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1896,6 +1896,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1921,6 +1921,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
          // Paper end
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index df2281d1..c147bb06 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -71,7 +71,7 @@ index 7b1843e16745ca8db2244e17490d291401f22679..0ac8bcb0a4b7d1da3d0e016617db7a81
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 32dc0cd20a4dd8fc02be1f7ba3d727db826dbe5d..33e9e84fe6c36e3b4b83aec6274a73e0ee3afdcb 100644
+index 77cd45f616e2ff38ad6a648b8b865a99e544f3ec..fa777f327bb2e541ce72d29ec55055232ef7808c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -84,10 +84,10 @@ index 32dc0cd20a4dd8fc02be1f7ba3d727db826dbe5d..33e9e84fe6c36e3b4b83aec6274a73e0
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f1e5ccfbcd08a73ac3aba9a1cb7b414faef81f9e..2ed922a100bfdf4500aef6b6b0d8c61bba6a4bdc 100644
+index 61c2f864bb23e75f6c377f7ccbf2ec44a670348c..63892d8e3f7a36dbe8dd60d4d30a04e5ce4706a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -243,7 +243,7 @@ import javax.annotation.Nullable; // Paper
+@@ -245,7 +245,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -97,7 +97,7 @@ index f1e5ccfbcd08a73ac3aba9a1cb7b414faef81f9e..2ed922a100bfdf4500aef6b6b0d8c61b
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index fbd604602024522bdd73aa1bde6fe2ccec63e442..af3c2f1c6ab4ee3e5bac42f4842a2af459c042a2 100644
+index 1b9e91b20dd9a9375a0a2a6a4d7a0bcdce9e7b1a..ff01f48071cff735b7a2dcc4cf22445b980da82b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -270,7 +270,7 @@ public class Main {
diff --git a/patches/server/0003-Leaves-Server-Config.patch b/patches/server/0003-Leaves-Server-Config.patch
index 815d0685..f5006334 100644
--- a/patches/server/0003-Leaves-Server-Config.patch
+++ b/patches/server/0003-Leaves-Server-Config.patch
@@ -19,7 +19,7 @@ index 06bff37e4c1fddd3be6343049a66787c63fb420c..15ed5a9af5583e2430804662e3b9fa95
  
          new TimingsExport(listeners, parent, history).start();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 33e9e84fe6c36e3b4b83aec6274a73e0ee3afdcb..4ce66a6d57ecc586f67679b15d14436d574cdd95 100644
+index fa777f327bb2e541ce72d29ec55055232ef7808c..4fc1144eab0bde2199ba9357858e3e64630a6642 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1140,6 +1140,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -65,10 +65,10 @@ index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..f15a1025c9edb4de8bfdfd9b0109e616
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2ed922a100bfdf4500aef6b6b0d8c61bba6a4bdc..a3adc71d859fd34f57af9cae970356e1af268c69 100644
+index 63892d8e3f7a36dbe8dd60d4d30a04e5ce4706a0..3d751aba4906b19eeefa1a8cde4a6305a7a0deea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -950,6 +950,7 @@ public final class CraftServer implements Server {
+@@ -957,6 +957,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -76,7 +76,7 @@ index 2ed922a100bfdf4500aef6b6b0d8c61bba6a4bdc..a3adc71d859fd34f57af9cae970356e1
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -965,6 +966,7 @@ public final class CraftServer implements Server {
+@@ -972,6 +973,7 @@ public final class CraftServer implements Server {
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -84,7 +84,7 @@ index 2ed922a100bfdf4500aef6b6b0d8c61bba6a4bdc..a3adc71d859fd34f57af9cae970356e1
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -2693,6 +2695,14 @@ public final class CraftServer implements Server {
+@@ -2715,6 +2717,14 @@ public final class CraftServer implements Server {
          {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
@@ -100,7 +100,7 @@ index 2ed922a100bfdf4500aef6b6b0d8c61bba6a4bdc..a3adc71d859fd34f57af9cae970356e1
          @Override
          public void restart() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index af3c2f1c6ab4ee3e5bac42f4842a2af459c042a2..67b19398ca125ef5ae9a6eefdf4399f9c6ce0dc0 100644
+index ff01f48071cff735b7a2dcc4cf22445b980da82b..165572859ced69879fddb3b6810bf13fb3a0cb8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -150,6 +150,14 @@ public class Main {
diff --git a/patches/server/0008-Add-Leaves-Command.patch b/patches/server/0008-Add-Leaves-Command.patch
index 60afb541..91dba80a 100644
--- a/patches/server/0008-Add-Leaves-Command.patch
+++ b/patches/server/0008-Add-Leaves-Command.patch
@@ -17,10 +17,10 @@ index 2294294bd192d380d99189a1884db7f2be885d04..026d79fb66cf96883a28e7a33707fb31
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a3adc71d859fd34f57af9cae970356e1af268c69..cfd7df713a6767e5b4d2582c29ecaad3bfaaa5ef 100644
+index 3d751aba4906b19eeefa1a8cde4a6305a7a0deea..298b8a38a83ec16bf2468ca2935883738d36feea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -982,6 +982,7 @@ public final class CraftServer implements Server {
+@@ -989,6 +989,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper