rebuilt patches

patches/api/0004-Add-getLastTickMs-api.patch

@@ -1,4 +1,4 @@
-From e2bd08ef856e14e38d65c094a0723e95b3bb635c Mon Sep 17 00:00:00 2001
+From 188ed83ffbb91220af2a6759a44c731d6a02a897 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 5 Mar 2020 21:13:14 +0100
 Subject: [PATCH] Add getLastTickMs() api
@@ -9,10 +9,10 @@ Subject: [PATCH] Add getLastTickMs() api
  2 files changed, 19 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 329e2dd1c..0d1105413 100644
+index 4e92ce182..db5be7074 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1744,6 +1744,14 @@ public final class Bukkit {
+@@ -1760,6 +1760,14 @@ public final class Bukkit {
          return server.getMobGoals();
      }
      // Paper end
@@ -28,10 +28,10 @@ index 329e2dd1c..0d1105413 100644
      @NotNull
      public static Server.Spigot spigot() {
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 959e4e7e7..544ccd353 100644
+index 65a40c4a9..ce69ad962 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1532,4 +1532,15 @@ public interface Server extends PluginMessageRecipient {
+@@ -1546,4 +1546,15 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
      // Paper end

patches/api/0005-Add-NBT-API-as-first-class-lib.patch

@@ -1,4 +1,4 @@
-From 47396928f38ffcd7bee95fe4318cf85220530ccc Mon Sep 17 00:00:00 2001
+From 3b055a7542be0eee942116338de2ff29bbe969c4 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 2 Apr 2020 18:49:56 +0200
 Subject: [PATCH] Add NBT-API as first-class lib
@@ -11,7 +11,7 @@ Subject: [PATCH] Add NBT-API as first-class lib
  4 files changed, 56 insertions(+)
 
 diff --git a/pom.xml b/pom.xml
-index 802351820..2b7a733d9 100644
+index fbfa66ea1..808fca9b0 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -43,6 +43,11 @@
@@ -50,7 +50,7 @@ index 802351820..2b7a733d9 100644
 +                    </relocations>
                  </configuration>
              </plugin>
-         </plugins>
+             <plugin>
 diff --git a/src/main/java/org/bukkit/block/TileState.java b/src/main/java/org/bukkit/block/TileState.java
 index 3b10fcc13..acb135968 100644
 --- a/src/main/java/org/bukkit/block/TileState.java
@@ -78,7 +78,7 @@ index 3b10fcc13..acb135968 100644
 +    // YAPFA end
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index d4c776f32..a7e5c4090 100644
+index 7808ade92..a8cf16da1 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -23,6 +23,8 @@ import org.jetbrains.annotations.Contract;
@@ -90,9 +90,9 @@ index d4c776f32..a7e5c4090 100644
  /**
   * Represents a base entity in the world
   */
-@@ -660,4 +662,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
-     @NotNull
-     org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
+@@ -695,4 +697,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+      */
+     public boolean isInLava();
      // Paper end
 +    
 +    // YAPFA start

patches/server/0003-Don-t-save-Fireworks-and-Arrows.patch

@@ -1,4 +1,4 @@
-From e94583e48c0633681292a7f9eff241a52dbfbf50 Mon Sep 17 00:00:00 2001
+From d5134ce97ec215e2f08ac8c9208b1162773c53ff Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Wed, 26 Feb 2020 21:39:58 +0100
 Subject: [PATCH] Don't save Fireworks and Arrows
@@ -8,10 +8,10 @@ Subject: [PATCH] Don't save Fireworks and Arrows
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 818afb4f49..9364f40c9b 100644
+index 3db19a9bab..9430cda805 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1711,7 +1711,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1714,7 +1714,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean a_(NBTTagCompound nbttagcompound) {

patches/server/0005-Add-getLastTickMs-api.patch

@@ -1,4 +1,4 @@
-From 3dd24c60dd437f8c89046d2755a885b25fcc546a Mon Sep 17 00:00:00 2001
+From 264d5684617fdf1410e4409c7a6df21833d26dc0 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 5 Mar 2020 21:13:33 +0100
 Subject: [PATCH] Add getLastTickMs() api
@@ -41,10 +41,10 @@ index 6949761d8b..ca166e498c 100644
              } else {
                  this.a((CrashReport) null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d33b57a5c7..d6c2cb315a 100644
+index c29002ac45..b0dff61d1b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2358,4 +2358,13 @@ public final class CraftServer implements Server {
+@@ -2381,4 +2381,13 @@ public final class CraftServer implements Server {
          return mobGoals;
      }
      // Paper end

patches/server/0010-Player-saving-async-FileIO.patch

@@ -1,4 +1,4 @@
-From c39e0c9acec0be7acf15457b9da65000710dd0a1 Mon Sep 17 00:00:00 2001
+From 3b2d14eee262b6906a7f85abcc16b89eeabfd19b Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Sat, 4 Apr 2020 23:23:04 +0200
 Subject: [PATCH] Player saving async FileIO
@@ -183,7 +183,7 @@ index 2cada09ced..321726139d 100644
              nbttagcompound.set("ShoulderEntityLeft", this.getShoulderEntityLeft());
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3c5ba8f2fd..919c584627 100644
+index 3c2f1f140c..71d67cec76 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -18,6 +18,9 @@ import java.util.Map;
@@ -196,7 +196,7 @@ index 3c5ba8f2fd..919c584627 100644
  import javax.annotation.Nullable;
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
-@@ -1237,6 +1240,28 @@ public abstract class PlayerList {
+@@ -1248,6 +1251,28 @@ public abstract class PlayerList {
              if (team != null) scoreboard.removeTeam(team);
          }
          // Paper end
@@ -225,7 +225,7 @@ index 3c5ba8f2fd..919c584627 100644
      }
      // Paper end
  
-@@ -1274,13 +1299,13 @@ public abstract class PlayerList {
+@@ -1285,13 +1310,13 @@ public abstract class PlayerList {
              File file = this.server.a(SavedFile.STATS).toFile();
              File file1 = new File(file, uuid + ".json");