Update 1.20.1

gradle.properties

@@ -1,8 +1,8 @@
 group=top.leavesmc.leaves
-version=1.20-R0.1-SNAPSHOT
+version=1.20.1-R0.1-SNAPSHOT
 
-mcVersion=1.20
+mcVersion=1.20.1
 packageVersion=1_20_R1
 org.gradle.jvmargs=-Xmx2G
-paperRef=f4dfdcbb5b287b1f42b31cb3a2ddada9bbf81703
+paperRef=2e363c73ba3c0a7b3d5138ec55a6e93c7befb5bb
 preVersion=true

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 1d1a1d087dabc9794e0062a064da2cced4062309..b3d333c898b8b64386d4253ca9272eab638040a0 100644
+index 5b225bbb128893d67251a96ab318035802a0cf76..d08e1fd95d9a3588bc54a078cfa93508ab1c86f9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1993,6 +1993,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2006,6 +2006,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
          // Paper end

patches/server/0001-Build-changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e7a03ea1dab56e7725f718da0b44c736018ac995..b84bd99de502335f75b5cc07d607756d81c7c9c2 100644
+index a0c5592530d2a59bfde87d1e9eb3752e7d4694da..e46f83f5146598ef249e027bdfb7cb5f550ef829 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -7,8 +7,12 @@ plugins {
@@ -16,14 +16,14 @@ index e7a03ea1dab56e7725f718da0b44c736018ac995..b84bd99de502335f75b5cc07d607756d
 -    implementation(project(":paper-mojangapi"))
 +	implementation(project(":leaves-api")) // Leaves
 +	// Leaves start
-+	implementation("io.papermc.paper:paper-mojangapi:1.19.4-R0.1-SNAPSHOT") {
++	implementation("io.papermc.paper:paper-mojangapi:1.20.1-R0.1-SNAPSHOT") {
 +		exclude("io.papermc.paper", "paper-api")
 +	}
 +	// Leaves end
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -56,13 +60,13 @@ tasks.jar {
+@@ -57,13 +61,13 @@ tasks.jar {
      manifest {
          val git = Git(rootProject.layout.projectDirectory.path)
          val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
@@ -39,7 +39,7 @@ index e7a03ea1dab56e7725f718da0b44c736018ac995..b84bd99de502335f75b5cc07d607756d
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -134,7 +138,7 @@ fun TaskContainer.registerRunTask(
+@@ -135,7 +139,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -79,10 +79,10 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..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 fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4..5235cdd0f8264b8bd47ddb984e95870138f17560 100644
+index 80cf4852e4010eeeadaf920ab927a40df0179b40..36cce6ed01e4953ada9695309d7d85317340cb7c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1681,7 +1681,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1679,7 +1679,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      @DontObfuscate
      public String getServerModName() {
@@ -92,10 +92,10 @@ index fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4..5235cdd0f8264b8bd47ddb984e958701
 
      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 ffa27c9c02dc4d12411fc089de3af8e8e12ba06e..9869740f1d0e5dfbc1ffa0d3de9b683db848396b 100644
+index 9f8c5ceb8485b14a84f2a7b2ffc8192be5c6bdfd..46bececa35aac65ba95aed49702a6bf8aa6789ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -262,7 +262,7 @@ import javax.annotation.Nullable; // Paper
+@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {

patches/server/0003-Update-version-fetcher-repo.patch

@@ -5,22 +5,19 @@ Subject: [PATCH] Update version fetcher repo
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index bf42969859545a8a520923ef1836ffa4a5cc24a0..895eac4479d27915566147d2f328e116ab1adbc9 100644
+index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..902a4a71faeb8c41f89659df0a2a31602b4781a6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -5,10 +5,9 @@ import com.google.common.base.Charsets;
- import com.google.common.io.Resources;
- import com.google.gson.*;
- import net.kyori.adventure.text.Component;
--import net.kyori.adventure.text.event.ClickEvent;
-+import net.kyori.adventure.text.TextComponent;
- import net.kyori.adventure.text.format.NamedTextColor;
- import net.kyori.adventure.text.format.TextDecoration;
--import net.kyori.adventure.text.TextComponent;
+@@ -20,7 +20,7 @@ import java.util.stream.StreamSupport;
+ public class PaperVersionFetcher implements VersionFetcher {
+     private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
+     private static final String GITHUB_BRANCH_NAME = "master";
+-    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
++    private static final String DOWNLOAD_PAGE = "https://github.com/LeavesMC/Leaves/releases"; // Leaves - change
+     private static @Nullable String mcVer;
 
- import javax.annotation.Nonnull;
- import javax.annotation.Nullable;
-@@ -31,8 +30,10 @@ public class PaperVersionFetcher implements VersionFetcher {
+     @Override
+@@ -31,8 +31,10 @@ public class PaperVersionFetcher implements VersionFetcher {
      @Nonnull
      @Override
      public Component getVersionMessage(@Nonnull String serverVersion) {
@@ -33,7 +30,7 @@ index bf42969859545a8a520923ef1836ffa4a5cc24a0..895eac4479d27915566147d2f328e116
          final Component history = getHistory();
 
          return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
-@@ -56,14 +57,12 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -56,14 +58,12 @@ public class PaperVersionFetcher implements VersionFetcher {
 
      private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
          int distance;
@@ -53,17 +50,21 @@ index bf42969859545a8a520923ef1836ffa4a5cc24a0..895eac4479d27915566147d2f328e116
          switch (distance) {
              case -1:
                  return Component.text("Error obtaining version information", NamedTextColor.YELLOW);
-@@ -72,12 +71,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-             case -2:
+@@ -73,11 +73,12 @@ public class PaperVersionFetcher implements VersionFetcher {
                  return Component.text("Unknown version", NamedTextColor.YELLOW);
              default:
--                return Component.text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW)
+                 return Component.text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW)
 -                        .append(Component.newline())
 -                        .append(Component.text("Download the new version at: ")
 -                                .append(Component.text(DOWNLOAD_PAGE, NamedTextColor.GOLD)
 -                                        .hoverEvent(Component.text("Click to open", NamedTextColor.WHITE))
 -                                        .clickEvent(ClickEvent.openUrl(DOWNLOAD_PAGE))));
-+                return Component.text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW); // Leaves - we dont have DOWNLOAD_PAGE now
++                    .append(Component.newline())
++                    .append(Component.text("Download the new version at: ")
++                        .append(Component.text(DOWNLOAD_PAGE, NamedTextColor.GOLD)
++                            .hoverEvent(Component.text("Click to open", NamedTextColor.WHITE))
++                            .clickEvent(ClickEvent.openUrl(DOWNLOAD_PAGE))));
++
          }
      }
 

patches/server/0004-Leaves-Server-Config-And-Command.patch

@@ -19,10 +19,10 @@ index a2f71a6d1a9e98133dff6cd0f625da9435a8af14..45897b81a822b9523c16658ca46a5077
 
          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 5235cdd0f8264b8bd47ddb984e95870138f17560..2c78ab8c70212926ecfd05cc1dea13794c259c27 100644
+index 36cce6ed01e4953ada9695309d7d85317340cb7c..e8f3f007edb8ff68c9ce435efb2793beb3db18c6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1120,6 +1120,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1118,6 +1118,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
              // Paper end
 
@@ -65,7 +65,7 @@ index 147d802d9207e358fdb2d1c7806fc2f634dcfd98..4f0a2c9b352f5824ec0c30d0f0af0fe1
          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 9869740f1d0e5dfbc1ffa0d3de9b683db848396b..5b128a82f9759dcc033d313f576914d6c9f2214b 100644
+index 46bececa35aac65ba95aed49702a6bf8aa6789ec..a0b0c99587dc0e0ce804c0c7c2b4d0bcf2fb0c2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -979,6 +979,7 @@ public final class CraftServer implements Server {
@@ -92,7 +92,7 @@ index 9869740f1d0e5dfbc1ffa0d3de9b683db848396b..5b128a82f9759dcc033d313f576914d6
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
 
-@@ -2758,6 +2761,14 @@ public final class CraftServer implements Server {
+@@ -2775,6 +2778,14 @@ public final class CraftServer implements Server {
          {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }

patches/server/0008-Fakeplayer-support.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fakeplayer support
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2c78ab8c70212926ecfd05cc1dea13794c259c27..badc618da91f554d11331e43524ac9ce59267175 100644
+index e8f3f007edb8ff68c9ce435efb2793beb3db18c6..621706945debe358ce2ee593b2aebd9a1608bd9c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -127,6 +127,7 @@ import net.minecraft.util.profiling.metrics.storage.MetricsPersister;
@@ -16,7 +16,7 @@ index 2c78ab8c70212926ecfd05cc1dea13794c259c27..badc618da91f554d11331e43524ac9ce
  import net.minecraft.world.entity.Entity;
  import net.minecraft.world.entity.ai.village.VillageSiege;
  import net.minecraft.world.entity.npc.CatSpawner;
-@@ -635,6 +636,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -633,6 +634,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          // Paper end
 
@@ -25,7 +25,7 @@ index 2c78ab8c70212926ecfd05cc1dea13794c259c27..badc618da91f554d11331e43524ac9ce
          this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
          this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
          this.connection.acceptConnections();
-@@ -940,6 +943,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -938,6 +941,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Shutdown and don't bother finishing
          MinecraftTimings.stopServer(); // Paper
@@ -58,7 +58,7 @@ index acc49f66bf34e2507d0ee6fec0a56b11bfc68f46..7fc87841fd72fc9b5bca4fbdffd378c7
          AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
          boolean flag1 = advancementprogress.isDone();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5fad40fa88f697108e42461c41012d5964ed7d75..420175039254f780bf4415b4118bec8f6d3351e1 100644
+index 9d46536f80b5b3e6641fd377c02166a431edfd77..9b0b939d99b7baeb61aaef1d437ebfff6722b7fe 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -185,6 +185,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -84,7 +84,7 @@ index 5fad40fa88f697108e42461c41012d5964ed7d75..420175039254f780bf4415b4118bec8f
                  PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
                  this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 683b5d78f9e3dc34e40c54683f64be32317797ac..4eaf7ae37557075ebe735827861507bee6b61eed 100644
+index 8547e7ff2f1f5b7701fb0f3c3010c14601a5f83e..014506532812a1723356191a72850000cb1d900d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -81,6 +81,7 @@ import net.minecraft.server.ServerScoreboard;
@@ -209,7 +209,7 @@ index 706b354ac9a1a6a4a1e61b2a109180d1dd22bbbd..f13f21dbd50f63a71276837abbcf82e0
          FeatureFlagSet featureflagset = player.level().enabledFeatures();
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ea056babe2f8123f20dc608d8a636da1de634b8c..7856337718f62b1bf4df52264e67740521d864ed 100644
+index 733158b6f2c2bd03fbe798562ff7bc33280548dc..8075b31c0d34a37e1b73302298d22979279c87e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -191,6 +191,8 @@ import org.bukkit.plugin.Plugin;
@@ -236,7 +236,7 @@ index ea056babe2f8123f20dc608d8a636da1de634b8c..7856337718f62b1bf4df52264e677405
              }
              // Water Animals
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 62d8bbd0b2638c725b4c5644a2d5063460fa25c9..b71496a3c0d9f9d69dadb652e2f35c09cf906bc0 100644
+index f3e09d197f0dafcba2e6247d637a9714bb051383..2c97c13f9d148b97a9492766aee976d035750ab6 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -7,6 +7,9 @@ import org.bukkit.Bukkit;

patches/server/0011-Add-isShrink-to-EntityResurrectEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add isShrink to EntityResurrectEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 67627bbf84f5aab2872f636b1dcb6728c8494147..67bf9ff852e190d89c877b86d9bfee07d6282430 100644
+index a189461330a4d427a7450d504ef13de3605497e3..c154e38b76ba303ec8d5b8503637e131a1508207 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1587,12 +1587,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -23,7 +23,7 @@ index 67627bbf84f5aab2872f636b1dcb6728c8494147..67bf9ff852e190d89c877b86d9bfee07
                      itemstack1.shrink(1);
                  }
                  if (itemstack != null && this instanceof ServerPlayer) {
-@@ -4452,3 +4452,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4455,3 +4455,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
 
      }
  }

patches/server/0016-No-chat-sign.patch

@@ -123,10 +123,10 @@ index 3e3e11d4207172d6c24895cef6c7b5a0b09352ee..9e374eb89e28a5406784a38ec146ee31
 
      protected boolean convertOldUsers() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ae82ab0e3d8e99f87ca8465fbcbb44b5ce18bf96..9c68dd4633d23310e7e1afb4fea52ceaeea00c02 100644
+index d9c2d06ae24dcf80a497e75f4c7f63d401b77f9b..f130fb5f81cd29aa261fb15174732901b8fcdedf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2141,10 +2141,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2144,10 +2144,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
 
      @Override
      public void send(Packet<?> packet) {
@@ -155,7 +155,7 @@ index ae82ab0e3d8e99f87ca8465fbcbb44b5ce18bf96..9c68dd4633d23310e7e1afb4fea52cea
          if (packet == null || this.processedDisconnect) { // Spigot
              return;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 4eaf7ae37557075ebe735827861507bee6b61eed..794386d40e2f53f2707b401907af5bb73e199eb1 100644
+index 014506532812a1723356191a72850000cb1d900d..f1dca35923a6507bd1eeeb2ee57854e794e16c98 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1450,7 +1450,7 @@ public abstract class PlayerList {

patches/server/0023-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Strip raytracing for EntityLiving#hasLineOfSight
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 903299fd5357b9955538aa20ec790672867bf394..00081da07c63d1507657d3d69e34e4342be17f9c 100644
+index f3a45bcc878e08318304dcbd1be1e19332d8dac7..f503ca69070091a5f5787bdffb5c6cd3a5777b4b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3667,7 +3667,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3670,7 +3670,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
              Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
 
              // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists