From 69018194e150bc5683af4f2ec0ebcc57abe8ad42 Mon Sep 17 00:00:00 2001
From: violetc <58360096+s-yh-china@users.noreply.github.com>
Date: Tue, 2 Aug 2022 21:45:57 +0800
Subject: [PATCH] Update 1.19.1

---
 .github/workflows/leaves.yml                  |  6 ++---
 README.md                                     |  4 +--
 README_cn.md                                  |  4 +--
 gradle.properties                             |  8 +++---
 .../server/0003-Leaves-Server-Config.patch    | 10 +++----
 .../server/0004-Fix-gravity-block-duper.patch |  4 +--
 .../0005-Fix-trading-with-the-void.patch      |  4 +--
 .../server/0010-Add-fakeplayer-support.patch  | 26 ++++++++-----------
 .../0011-Add-fakeplayer-action-support.patch  |  4 +--
 ...Add-isShrink-to-EntityResurrectEvent.patch |  4 +--
 .../0016-Spectator-dont-get-Advancement.patch |  6 ++---
 11 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/leaves.yml b/.github/workflows/leaves.yml
index e2e2b222..18e158bf 100644
--- a/.github/workflows/leaves.yml
+++ b/.github/workflows/leaves.yml
@@ -37,14 +37,14 @@ jobs:
         arguments: createReobfPaperclipJar
     - name: Rename Jar And Set env
       run: |
-        mv build/libs/Leaves-paperclip-1.19-R0.1-SNAPSHOT-reobf.jar leaves-1.19.jar
+        mv build/libs/Leaves-paperclip-1.19.1-R0.1-SNAPSHOT-reobf.jar leaves-1.19.1.jar
         echo "message=`git log --pretty=format:“%s” -1`" >> $GITHUB_ENV
         echo "name=Leaves-`git rev-parse --short HEAD`" >> $GITHUB_ENV
-        echo "tag=1.19-`git rev-parse --short HEAD`" >> $GITHUB_ENV
+        echo "tag=1.19.1-`git rev-parse --short HEAD`" >> $GITHUB_ENV
     - name: Create Release
       uses: ncipollo/release-action@v1
       with:
-        artifacts: leaves-1.19.jar
+        artifacts: leaves-1.19.1.jar
         body: ${{ env.message }}
         tag: ${{ env.tag }}
         prerelease: false
diff --git a/README.md b/README.md
index fde2051d..e4fef80d 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Leaves-API maven dependency:
 <dependency>
     <groupId>top.leavesmc.leaves</groupId>
     <artifactId>leaves-api</artifactId>
-    <version>1.19-R0.1-SNAPSHOT</version>
+    <version>1.19.1-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
  </dependency>
  ```
@@ -35,7 +35,7 @@ Leaves-Server maven dependency:
 <dependency>
     <groupId>top.leavesmc.leaves</groupId>
     <artifactId>leaves</artifactId>
-    <version>1.19-R0.1-SNAPSHOT</version>
+    <version>1.19.1-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
diff --git a/README_cn.md b/README_cn.md
index 4d661280..80bab93f 100644
--- a/README_cn.md
+++ b/README_cn.md
@@ -24,7 +24,7 @@ Leaves-API:
 <dependency>
     <groupId>top.leavesmc.leaves</groupId>
     <artifactId>leaves-api</artifactId>
-    <version>1.19-R0.1-SNAPSHOT</version>
+    <version>1.19.1-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
  </dependency>
  ```
@@ -34,7 +34,7 @@ Leaves-Server:
 <dependency>
     <groupId>top.leavesmc.leaves</groupId>
     <artifactId>leaves</artifactId>
-    <version>1.19-R0.1-SNAPSHOT</version>
+    <version>1.19.1-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
diff --git a/gradle.properties b/gradle.properties
index f7f6f687..592bfb7b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = top.leavesmc.leaves
-version = 1.19-R0.1-SNAPSHOT
+version = 1.19.1-R0.1-SNAPSHOT
 
-mcVersion = 1.19
-packageVersion = 1_19_R0
+mcVersion = 1.19.1
+packageVersion = 1_19_R1
 org.gradle.jvmargs=-Xmx2G
-paperRef=86f87ba40030d719e5fb8840ab18c513588de772
+paperRef=e0486ae2cde50eaa51de09c81c367f85d46f990e
diff --git a/patches/server/0003-Leaves-Server-Config.patch b/patches/server/0003-Leaves-Server-Config.patch
index d04de147..150162e2 100644
--- a/patches/server/0003-Leaves-Server-Config.patch
+++ b/patches/server/0003-Leaves-Server-Config.patch
@@ -19,10 +19,10 @@ 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 e137e18cdca9fd3d1add500a178459a93465e789..130147d9423267a675ac5a824ee8de14e2195a0e 100644
+index 7301c552ab695b81560eeefa44b2f29d4f4ac258..35fef03d2825d9e7f5ee324384ea8270bfde8f6f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1141,6 +1141,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1144,6 +1144,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
              // Paper end
  
@@ -31,7 +31,7 @@ index e137e18cdca9fd3d1add500a178459a93465e789..130147d9423267a675ac5a824ee8de14
              org.spigotmc.WatchdogThread.hasStarted = true; // Paper
              Arrays.fill( recentTps, 20 );
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index b42327dcf0cc9feaf4fdb67de949dd36cf71bbaa..055260dd5a9f106e6e81aae48407f1711d6a93ab 100644
+index bdd6560fe85950b0a857a949cb38c044da44ca6b..7ad3569628fd6c6ac0038394e7d88979b29935a0 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -226,6 +226,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -44,7 +44,7 @@ index b42327dcf0cc9feaf4fdb67de949dd36cf71bbaa..055260dd5a9f106e6e81aae48407f171
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9467ccaa1d73e1913495a46919aee530e749977d..4ea3b42c62b657ba386c9dca3d2afe5cd9b256a5 100644
+index 5a2a1d394852d39ea576624586f7fa736dec807c..fd18fb454263893d404979a9c9af860ee2ba9a3a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -174,6 +174,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -99,7 +99,7 @@ index b64c470234c8f50f1cfb83bf6d2efb5038eae45b..599ad9516e9642f774c4f8b1d60b453a
          @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 047490ef7c3944f14605e08a888e67611a499f75..6b7f4e4211fe12b47d79f98f511b3d6d792d49c0 100644
+index 95f296ef42cb9f1d486962a0a31da9aa436967c7..e40978698bd76132b56d5a1bc9791f05db1bccf5 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/0004-Fix-gravity-block-duper.patch b/patches/server/0004-Fix-gravity-block-duper.patch
index e48cb200..a0d91369 100644
--- a/patches/server/0004-Fix-gravity-block-duper.patch
+++ b/patches/server/0004-Fix-gravity-block-duper.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix gravity block duper
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 99f454b4a3a12fb9bf8e1d506ab311e4166700da..e09a44bfec96bce3e6a5c64040860a391e6da65c 100644
+index f925a8d550ecbf2044a37bfe58b30d6578c5f6af..eda98b85fb00fe7787d2f7a643c3854aa4b02fbf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -460,36 +460,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -46,7 +46,7 @@ index 99f454b4a3a12fb9bf8e1d506ab311e4166700da..e09a44bfec96bce3e6a5c64040860a39
  
      // Paper start
      /**
-@@ -2887,7 +2859,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2884,7 +2856,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0005-Fix-trading-with-the-void.patch b/patches/server/0005-Fix-trading-with-the-void.patch
index 806d29a2..63d492b1 100644
--- a/patches/server/0005-Fix-trading-with-the-void.patch
+++ b/patches/server/0005-Fix-trading-with-the-void.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix trading with the void
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1a918eabbaaed26d9bdf5c01e0488b5a117ba516..08e378a61fa024058efcf09139211e2ca4a4b080 100644
+index 083349794d5ceb50322c5a645dd33fbfcc1c8155..82e3070ad9478a629bee45c8089d68d467ed9749 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2591,11 +2591,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2592,11 +2592,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
diff --git a/patches/server/0010-Add-fakeplayer-support.patch b/patches/server/0010-Add-fakeplayer-support.patch
index 01822708..472fe8e8 100644
--- a/patches/server/0010-Add-fakeplayer-support.patch
+++ b/patches/server/0010-Add-fakeplayer-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add fakeplayer support
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index de0513b38e5fa0138f1cee6bb633561be12449fc..8548ef7f79e85aca593928b8e748d8b6d53e52bd 100644
+index a0c19503aabab5378d672a30163d35a5ba05b6c1..8873e12cbd3d6f9071efedb35ea3c69c78033d78 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -50,6 +50,7 @@ import net.minecraft.server.players.PlayerList;
+@@ -48,6 +48,7 @@ import net.minecraft.server.players.PlayerList;
  import net.minecraft.util.datafix.DataFixTypes;
  import net.minecraft.world.level.GameRules;
  import org.slf4j.Logger;
@@ -16,7 +16,7 @@ index de0513b38e5fa0138f1cee6bb633561be12449fc..8548ef7f79e85aca593928b8e748d8b6
  
  public class PlayerAdvancements {
  
-@@ -274,6 +275,11 @@ public class PlayerAdvancements {
+@@ -272,6 +273,11 @@ public class PlayerAdvancements {
      }
  
      public boolean award(Advancement advancement, String criterionName) {
@@ -29,10 +29,10 @@ index de0513b38e5fa0138f1cee6bb633561be12449fc..8548ef7f79e85aca593928b8e748d8b6
          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 5f0d934399991ae94795ad0a94da689c242ffeba..17daf0e9ef3b3ea79f49388113b87052a2ef87e1 100644
+index 6cbd839cc7529eb0095485c4ef4a0d81a3cd9b19..0a4edeed3e6c4813e7ef3cf847ccbbe1325d03c6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -173,6 +173,7 @@ import org.bukkit.event.player.PlayerPortalEvent;
+@@ -174,6 +174,7 @@ import org.bukkit.event.player.PlayerPortalEvent;
  import org.bukkit.event.player.PlayerTeleportEvent;
  import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
  import org.bukkit.inventory.MainHand;
@@ -40,7 +40,7 @@ index 5f0d934399991ae94795ad0a94da689c242ffeba..17daf0e9ef3b3ea79f49388113b87052
  // CraftBukkit end
  
  public class ServerPlayer extends Player {
-@@ -1179,6 +1180,13 @@ public class ServerPlayer extends Player {
+@@ -1177,6 +1178,13 @@ public class ServerPlayer extends Player {
                  this.lastSentHealth = -1.0F;
                  this.lastSentFood = -1;
  
@@ -55,10 +55,10 @@ index 5f0d934399991ae94795ad0a94da689c242ffeba..17daf0e9ef3b3ea79f49388113b87052
                  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 20cdfdb3b9351f74e89bc45b3ab972384165659a..e7d425fc7187dad45416827260804c6b93117032 100644
+index d63bfd9d3194a2972a984ec3a817767a683a940d..f3c3c530d9ae974c9b35e1a12f60e5bad014b42a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -100,10 +100,10 @@ import net.minecraft.world.scores.Objective;
+@@ -96,6 +96,7 @@ import net.minecraft.world.scores.Objective;
  import net.minecraft.world.scores.PlayerTeam;
  import net.minecraft.world.scores.Scoreboard; // Paper
  import net.minecraft.world.scores.Team;
@@ -66,11 +66,7 @@ index 20cdfdb3b9351f74e89bc45b3ab972384165659a..e7d425fc7187dad45416827260804c6b
  import org.slf4j.Logger;
  
  // CraftBukkit start
--import io.papermc.paper.adventure.PaperAdventure; // Paper
- import com.google.common.base.Predicate;
- import java.util.stream.Collectors;
- import net.minecraft.server.dedicated.DedicatedServer;
-@@ -113,7 +113,6 @@ import org.bukkit.Location;
+@@ -113,7 +114,6 @@ import org.bukkit.Location;
  import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.craftbukkit.CraftWorld;
  import org.bukkit.craftbukkit.entity.CraftPlayer;
@@ -78,7 +74,7 @@ index 20cdfdb3b9351f74e89bc45b3ab972384165659a..e7d425fc7187dad45416827260804c6b
  import org.bukkit.entity.Player;
  import org.bukkit.event.player.PlayerChangedWorldEvent;
  import org.bukkit.event.player.PlayerJoinEvent;
-@@ -368,6 +367,18 @@ public abstract class PlayerList {
+@@ -369,6 +369,18 @@ public abstract class PlayerList {
              return;
          }
  
@@ -98,7 +94,7 @@ index 20cdfdb3b9351f74e89bc45b3ab972384165659a..e7d425fc7187dad45416827260804c6b
  
          if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b80cc0938b2b3928f4450f1314a9fbd7ea9c116b..8624cfb27246c1e39994d14a3cef48e68a3a3488 100644
+index 6549ade8e19807c523e5a1dc68b66585aad438b1..b58a4fb6563554c8a5a10eada110125fb1e979b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -187,6 +187,8 @@ import org.bukkit.plugin.Plugin;
diff --git a/patches/server/0011-Add-fakeplayer-action-support.patch b/patches/server/0011-Add-fakeplayer-action-support.patch
index a97dd186..d181bd78 100644
--- a/patches/server/0011-Add-fakeplayer-action-support.patch
+++ b/patches/server/0011-Add-fakeplayer-action-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add fakeplayer action support
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index cd9cbfa5ef94994b3f7f2ecdde843620e7e6c071..7bd5a106028958c829ef9e161d5c287ff36c3f6c 100644
+index 9b131f0a827413e9f5d6d0f7491c5481576cb8b1..e2305caf0b3ce21810a31e05c943a6d859870bd5 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1290,7 +1290,7 @@ public abstract class Player extends LivingEntity {
+@@ -1291,7 +1291,7 @@ public abstract class Player extends LivingEntity {
                      boolean flag3 = false;
                      double d0 = (double) (this.walkDist - this.walkDistO);
  
diff --git a/patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch b/patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch
index 9442679e..2196ceb3 100644
--- a/patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch
+++ b/patches/server/0014-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 e8dc99752d06ca40f17f3ad2c829b2447b703d7c..43d15afe4c121c3c808639b6737e157d8cd08f91 100644
+index cff7993bdafd2f69e46c9985c7601a69ae47f452..2dee51917888e20768f434b8232430094028b516 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1530,12 +1530,12 @@ public abstract class LivingEntity extends Entity {
@@ -23,7 +23,7 @@ index e8dc99752d06ca40f17f3ad2c829b2447b703d7c..43d15afe4c121c3c808639b6737e157d
                      itemstack1.shrink(1);
                  }
                  if (itemstack != null && this instanceof ServerPlayer) {
-@@ -4371,3 +4371,4 @@ public abstract class LivingEntity extends Entity {
+@@ -4374,3 +4374,4 @@ public abstract class LivingEntity extends Entity {
  
      }
  }
diff --git a/patches/server/0016-Spectator-dont-get-Advancement.patch b/patches/server/0016-Spectator-dont-get-Advancement.patch
index b1ddcacd..1086645b 100644
--- a/patches/server/0016-Spectator-dont-get-Advancement.patch
+++ b/patches/server/0016-Spectator-dont-get-Advancement.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Spectator dont get Advancement
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index 8548ef7f79e85aca593928b8e748d8b6d53e52bd..7f9786de88a03786c39fa3e85779ac1e751ef51a 100644
+index 8873e12cbd3d6f9071efedb35ea3c69c78033d78..1fdaa8a9993dd6881877a3b00b02487a09a34cbe 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -49,6 +49,7 @@ import net.minecraft.server.level.ServerPlayer;
+@@ -47,6 +47,7 @@ import net.minecraft.server.level.ServerPlayer;
  import net.minecraft.server.players.PlayerList;
  import net.minecraft.util.datafix.DataFixTypes;
  import net.minecraft.world.level.GameRules;
@@ -16,7 +16,7 @@ index 8548ef7f79e85aca593928b8e748d8b6d53e52bd..7f9786de88a03786c39fa3e85779ac1e
  import org.slf4j.Logger;
  import top.leavesmc.leaves.bot.ServerBot;
  
-@@ -280,6 +281,11 @@ public class PlayerAdvancements {
+@@ -278,6 +279,11 @@ public class PlayerAdvancements {
              return false;
          }
          // Leaves end - bot can't get advancement