Date: Mon, 31 Jul 2017 01:49:43 -0500
Subject: [PATCH] LivingEntity#setKiller
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5697728ce..ffbf3d7a8 100644
+index f5969cad..7e8fc5b3 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -250,6 +250,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -25,5 +25,5 @@ index 5697728ce..ffbf3d7a8 100644
* Adds the given {@link PotionEffect} to the living entity.
*
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
index b00044248a..90e9466a67 100644
--- a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
+++ b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
@@ -1,4 +1,4 @@
-From 61284d609548d572f43cd0342875b93feaefd295 Mon Sep 17 00:00:00 2001
+From d5fd96d447dd6f8d8fa433d18082329fea603982 Mon Sep 17 00:00:00 2001
From: Minecrell
Date: Thu, 21 Sep 2017 16:14:13 +0200
Subject: [PATCH] Handle plugin prefixes in implementation logging
@@ -17,7 +17,7 @@ The implementation should handle plugin prefixes by displaying
logger names when appropriate.
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 223190054..bb2e55e97 100644
+index 22319005..bb2e55e9 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
@@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase {
@@ -40,5 +40,5 @@ index 223190054..bb2e55e97 100644
/**
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
index 7216067902..369e4abc0b 100644
--- a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -1,4 +1,4 @@
-From 0a294869c703f3fc7f22f2752e20cedd85985c12 Mon Sep 17 00:00:00 2001
+From 349a9bf5d5d38cd62f2ed1df7e6524cb9900c6e2 Mon Sep 17 00:00:00 2001
From: Minecrell
Date: Thu, 21 Sep 2017 16:33:12 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging
@@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through
several layers of logging abstraction.
diff --git a/pom.xml b/pom.xml
-index a6567413..1179fd55 100644
+index 5c25ff12..a71015f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,6 +109,13 @@
@@ -50,5 +50,5 @@ index febfec6e..79890c68 100644
* Returns the name of the plugin.
*
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
index ec337fc0d3..e2d50a4482 100644
--- a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
@@ -1,4 +1,4 @@
-From 91259973846180ea7f731ae367e1f0f7f57a1782 Mon Sep 17 00:00:00 2001
+From d5c1e782cc2702e6378bd565345ed520567c6ce2 Mon Sep 17 00:00:00 2001
From: Minecrell
Date: Thu, 21 Sep 2017 19:41:20 +0200
Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin
@@ -116,5 +116,5 @@ index 7133be0a..9924780d 100644
}
}
--
-2.25.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
index 3b91dd8f09..4257ac6364 100644
--- a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
+++ b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
@@ -1,4 +1,4 @@
-From 3b3d6200514d4c75675a971831a3f303353cb1cd Mon Sep 17 00:00:00 2001
+From 391c8c2ec698ac64a495038842cbb2228c92e4bc Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Thu, 28 Sep 2017 17:21:32 -0400
Subject: [PATCH] Add PlayerJumpEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerJumpEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
new file mode 100644
-index 000000000..289a0d784
+index 00000000..289a0d78
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
@@ -0,0 +1,106 @@
@@ -117,5 +117,5 @@ index 000000000..289a0d784
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
index 81d5504dc3..20f8733711 100644
--- a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From 0895c179d69d82b098e9314d5c9e30b4c547091c Mon Sep 17 00:00:00 2001
+From acb615089a33d457c84bce216ba87649efe7e50d Mon Sep 17 00:00:00 2001
From: Minecrell
Date: Tue, 10 Oct 2017 18:44:42 +0200
Subject: [PATCH] Expose client protocol version and virtual host
@@ -57,7 +57,7 @@ index 00000000..7b2af1bd
+
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 881ccce5..0a630843 100644
+index da36c8df..dbe53123 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
@@ -70,5 +70,5 @@ index 881ccce5..0a630843 100644
/**
* Gets the "friendly" name to display of this player. This may include
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
index 31beef7335..5c74eda253 100644
--- a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
@@ -1,4 +1,4 @@
-From 3c961429504386861077423406b05410527fb380 Mon Sep 17 00:00:00 2001
+From 119d214a5cf12953f1d00e283e2c5768be6d9d03 Mon Sep 17 00:00:00 2001
From: pkt77
Date: Fri, 10 Nov 2017 23:45:59 -0500
Subject: [PATCH] Add PlayerArmorChangeEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
new file mode 100644
-index 000000000..2827a1002
+index 00000000..2827a100
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java
@@ -0,0 +1,137 @@
@@ -148,5 +148,5 @@ index 000000000..2827a1002
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
index be4cf45451..c14620bb68 100644
--- a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From 29c742337866538cb309776a8db6962465ee6661 Mon Sep 17 00:00:00 2001
+From aab556b666c1f5b415f1bd6fd6f3598964819f4e Mon Sep 17 00:00:00 2001
From: Aikar
Date: Mon, 6 Nov 2017 21:10:01 -0500
Subject: [PATCH] API to get a BlockState without a snapshot
@@ -9,7 +9,7 @@ on the real tile entity.
This is useful for where performance is needed
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index ab6750c7a..af4ffada0 100644
+index ab6750c7..af4ffada 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -268,6 +268,16 @@ public interface Block extends Metadatable {
@@ -30,5 +30,5 @@ index ab6750c7a..af4ffada0 100644
* Returns the biome that this block resides in
*
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
index 3d3b603a23..77b0440087 100644
--- a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
+++ b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From fb6546240316a84266aada07ea0a0048e0b2a4ea Mon Sep 17 00:00:00 2001
+From 0cf763fb20fce10342ebec0cbcfa200d8b8a7a5b Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sun, 26 Nov 2017 13:17:09 -0500
Subject: [PATCH] AsyncTabCompleteEvent
@@ -13,7 +13,7 @@ completion, such as offline players.
diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
new file mode 100644
-index 000000000..619ed3716
+index 00000000..619ed371
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
@@ -0,0 +1,177 @@
@@ -195,7 +195,7 @@ index 000000000..619ed3716
+ }
+}
diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
-index d1a9956a1..f96c4ba53 100644
+index d1a9956a..f96c4ba5 100644
--- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
+++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
@@ -1,5 +1,6 @@
@@ -265,5 +265,5 @@ index d1a9956a1..f96c4ba53 100644
@Override
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
index fee100f278..468431ec57 100644
--- a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
+++ b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
@@ -1,4 +1,4 @@
-From 6bfa8efdb8a6b1c98417d31611ab555466775816 Mon Sep 17 00:00:00 2001
+From e2ace04b7cc11c54b3a492d9a95a492b6aad8881 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sat, 9 Dec 2017 12:40:25 -0500
Subject: [PATCH] Display warning on deprecated recipe API
@@ -10,7 +10,7 @@ on the players login.
Plugin authors need to define a key to keep it consistent between server restarts.
diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index d74b3114f..d742c4058 100644
+index d74b3114..d742c405 100644
--- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
+++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
@@ -25,6 +25,7 @@ public class ShapedRecipe implements Recipe, Keyed {
@@ -22,7 +22,7 @@ index d74b3114f..d742c4058 100644
}
diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 68447fb8c..84062dd71 100644
+index 68447fb8..84062dd7 100644
--- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
+++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
@@ -26,6 +26,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
@@ -34,5 +34,5 @@ index 68447fb8c..84062dd71 100644
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
index 2eeb2949bf..e91eb8bdfc 100644
--- a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
+++ b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From beaa74caee947fe0235be01e39e0a655c89b8502 Mon Sep 17 00:00:00 2001
+From 76a536dbdb61eb6fde0d55df507f92deb21e6a31 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 19 Dec 2017 22:00:41 -0500
Subject: [PATCH] PlayerPickupExperienceEvent
@@ -7,7 +7,7 @@ Allows plugins to cancel a player picking up an experience orb
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java
new file mode 100644
-index 000000000..f7beb22d5
+index 00000000..f7beb22d
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java
@@ -0,0 +1,80 @@
@@ -92,5 +92,5 @@ index 000000000..f7beb22d5
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
index a113a52477..cb9f21034d 100644
--- a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
+++ b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From 49f9c641363fbbfd13423c3dbbf4fccdebdbe179 Mon Sep 17 00:00:00 2001
+From 72c291be9d0bb7daaf28bba76ff4968f10eb05df Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 19 Dec 2017 22:56:24 -0500
Subject: [PATCH] ExperienceOrbMergeEvent
@@ -9,7 +9,7 @@ metadata such as spawn reason, or conditionally move data from source to target.
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
new file mode 100644
-index 000000000..0ce3e3977
+index 00000000..0ce3e397
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
@@ -0,0 +1,87 @@
@@ -101,5 +101,5 @@ index 000000000..0ce3e3977
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
index 91181f8e33..3cabe5615f 100644
--- a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From d668b4a2573d6df68b52462d67d209ab210d6506 Mon Sep 17 00:00:00 2001
+From af375fcae65a50a414f7c3b33c75d90d43edf6a9 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Wed, 20 Dec 2017 17:38:07 -0500
Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
Both an API To standalone mend, and apply mending logic to .giveExp has been added.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0a630843..2bd1af78 100644
+index dbe53123..420aa906 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -934,12 +934,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -49,5 +49,5 @@ index 0a630843..2bd1af78 100644
/**
* Gives the player the amount of experience levels specified. Levels can
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
index 59d6bbd587..6872017651 100644
--- a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
+++ b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From f964e9674f741b077eb95edddad85d9faf01e638 Mon Sep 17 00:00:00 2001
+From a532d8b8494cbfe850034f92ca644fc5f566c4fc Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sun, 14 Jan 2018 16:59:43 -0500
Subject: [PATCH] PreCreatureSpawnEvent
@@ -16,7 +16,7 @@ See: https://github.com/PaperMC/Paper/issues/917
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
new file mode 100644
-index 000000000..d5edde9cd
+index 00000000..d5edde9c
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java
@@ -0,0 +1,104 @@
@@ -125,5 +125,5 @@ index 000000000..d5edde9cd
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
index ac47e13363..37ede87ebd 100644
--- a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From fb78151fa68d3a9ab9cb2cf3659a02595560a03b Mon Sep 17 00:00:00 2001
+From 8bb61dab0ecdcf6e35175d10d9d2f8a003505894 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sun, 14 Jan 2018 17:31:37 -0500
Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -10,7 +10,7 @@ Also a highly more effecient way to blanket block spawns in a world
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java
new file mode 100644
-index 000000000..112a0dbf5
+index 00000000..112a0dbf
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java
@@ -0,0 +1,64 @@
@@ -79,5 +79,5 @@ index 000000000..112a0dbf5
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch
index 7a04cf93ba..255cf94053 100644
--- a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From cc8a78acc426282ecc2d2e90e0e031f1aa8ea82f Mon Sep 17 00:00:00 2001
+From cbdb821df0d1d148d04aeda9d0f83199e90c6f72 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Fri, 19 Jan 2018 00:29:28 -0500
Subject: [PATCH] Add setPlayerProfile API for Skulls
@@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
which commonly cause rate limit issues with Mojang API
diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java
-index 943d751fb..a6914f01e 100644
+index 943d751f..a6914f01 100644
--- a/src/main/java/org/bukkit/block/Skull.java
+++ b/src/main/java/org/bukkit/block/Skull.java
@@ -7,6 +7,7 @@ import org.bukkit.block.data.BlockData;
@@ -40,7 +40,7 @@ index 943d751fb..a6914f01e 100644
* Gets the rotation of the skull in the world (or facing direction if this
* is a wall mounted skull).
diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
-index 35a392033..8b2465ea2 100644
+index 35a39203..8b2465ea 100644
--- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
@@ -1,9 +1,11 @@
@@ -77,5 +77,5 @@ index 35a392033..8b2465ea2 100644
* Gets the owner of the skull.
*
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
index fe47f7aeb4..512cdb1614 100644
--- a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
+++ b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From ffffc2c2bd2a8c6302355b9eaa249cfe5021159b Mon Sep 17 00:00:00 2001
+From 49361ac9699332af1561efa4ef6e66a17aede152 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 2 Jan 2018 00:31:08 -0500
Subject: [PATCH] Fill Profile Property Events
@@ -12,7 +12,7 @@ This is useful for implementing a ProfileCache for Player Skulls
diff --git a/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
new file mode 100644
-index 000000000..71f36e9ca
+index 00000000..71f36e9c
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
@@ -0,0 +1,75 @@
@@ -93,7 +93,7 @@ index 000000000..71f36e9ca
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
new file mode 100644
-index 000000000..021bc8631
+index 00000000..021bc863
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
@@ -0,0 +1,77 @@
@@ -175,5 +175,5 @@ index 000000000..021bc8631
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
index 945bb78a23..0a82f0bec5 100644
--- a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,4 +1,4 @@
-From 87ae4675cc8f9248300f7c41d06121b0dca856ee Mon Sep 17 00:00:00 2001
+From be3e65856f9a9b498ac9a1e8b9427d57e533af6d Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Fri, 19 Jan 2018 08:15:14 -0600
Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java
new file mode 100644
-index 000000000..bb8d7c959
+index 00000000..bb8d7c95
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java
@@ -0,0 +1,63 @@
@@ -74,5 +74,5 @@ index 000000000..bb8d7c959
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
index b7b6b3b165..2c6889d0cf 100644
--- a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From 430c19d7aa0eb0e2dbde634676b665d253669d61 Mon Sep 17 00:00:00 2001
+From 71ae7aea9324a132adf65042528ec5b02fe13c55 Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Sat, 27 Jan 2018 17:06:24 -0500
Subject: [PATCH] Add ArmorStand Item Meta
@@ -12,7 +12,7 @@ starting point for future additions in this area.
diff --git a/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
new file mode 100644
-index 000000000..7e4acfff1
+index 00000000..7e4acfff
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java
@@ -0,0 +1,78 @@
@@ -95,5 +95,5 @@ index 000000000..7e4acfff1
+ void setMarker(boolean marker);
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0084-Optimize-Hoppers.patch b/Spigot-API-Patches/0084-Optimize-Hoppers.patch
index bf84a463f7..80a85adffa 100644
--- a/Spigot-API-Patches/0084-Optimize-Hoppers.patch
+++ b/Spigot-API-Patches/0084-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From f504537606dd234d43075d20e9efac0e76bdb2d9 Mon Sep 17 00:00:00 2001
+From 7a9bf3167d5a6e2cc1a2fbd66f739f373ac54e9c Mon Sep 17 00:00:00 2001
From: Aikar
Date: Thu, 18 Jan 2018 01:00:27 -0500
Subject: [PATCH] Optimize Hoppers
@@ -7,7 +7,7 @@ Adds data about what Item related methods were used in InventoryMoveItem event
so that the server can improve the performance of this event.
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
-index a8c48f5a4..04d4a83bf 100644
+index a8c48f5a..04d4a83b 100644
--- a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
+++ b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
@@ -31,6 +31,8 @@ public class InventoryMoveItemEvent extends Event implements Cancellable {
@@ -38,5 +38,5 @@ index a8c48f5a4..04d4a83bf 100644
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
index 18e6815d24..0417c893e2 100644
--- a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From a94f5fca9e22f84e1ed553bb53228938c3a7e079 Mon Sep 17 00:00:00 2001
+From 3f28b2263c941869901fd442a8cdf09cc619e7b6 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sat, 24 Feb 2018 00:55:52 -0500
Subject: [PATCH] Tameable#getOwnerUniqueId API
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
an OfflinePlayer to be loaded from disk.
diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java
-index 0c066bdfc..be436f8df 100644
+index 0c066bdf..be436f8d 100644
--- a/src/main/java/org/bukkit/entity/Tameable.java
+++ b/src/main/java/org/bukkit/entity/Tameable.java
@@ -1,5 +1,6 @@
@@ -41,5 +41,5 @@ index 0c066bdfc..be436f8df 100644
*/
@Nullable
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 344862a717..95f70bdb8d 100644
--- a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From e37945a5eefd4246c9fc42b42daf2e9ce81d7f13 Mon Sep 17 00:00:00 2001
+From 1f100fb84d5576405ccbd83e5b9a9c08210ab689 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sun, 18 Mar 2018 11:43:30 -0400
Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
This will allow you to change the players name or skin on login.
diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index c8384da69..6c09ea6c6 100644
+index c8384da6..6c09ea6c 100644
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
@@ -2,6 +2,9 @@ package org.bukkit.event.player;
@@ -53,5 +53,5 @@ index c8384da69..6c09ea6c6 100644
this.message = "";
this.name = name;
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
index d0e550c9e7..419aa1b0ca 100644
--- a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
+++ b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From 05c90b3a666999ecf6ca0fdb824c8e4ef3f09528 Mon Sep 17 00:00:00 2001
+From 3a712b40988d06d9a8f42119c9eb6fc0968ae18d Mon Sep 17 00:00:00 2001
From: Minecrell
Date: Wed, 11 Oct 2017 15:55:38 +0200
Subject: [PATCH] Add extended PaperServerListPingEvent
@@ -8,7 +8,7 @@ and allows full control of the response sent to the client.
diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
new file mode 100644
-index 000000000..0cc5dd573
+index 00000000..0cc5dd57
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
@@ -0,0 +1,323 @@
@@ -337,7 +337,7 @@ index 000000000..0cc5dd573
+}
diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
new file mode 100644
-index 000000000..517d15238
+index 00000000..517d1523
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
@@ -0,0 +1,13 @@
@@ -355,7 +355,7 @@ index 000000000..517d15238
+
+}
diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
-index 612958a33..bb4f7702c 100644
+index 612958a3..bb4f7702 100644
--- a/src/main/java/org/bukkit/util/CachedServerIcon.java
+++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
@@ -18,4 +18,9 @@ public interface CachedServerIcon {
@@ -369,5 +369,5 @@ index 612958a33..bb4f7702c 100644
+ // Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
index dd4795e84a..9e8f7e30c2 100644
--- a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 5e862d3cce62af29bd527af00a7b5f936f76b334 Mon Sep 17 00:00:00 2001
+From 5262b321dc03d1f58178d7b684ecad630cd041a4 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sun, 18 Mar 2018 12:28:55 -0400
Subject: [PATCH] Player.setPlayerProfile API
@@ -39,5 +39,5 @@ index 420aa906..083110cc 100644
// Spigot start
--
-2.25.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
index c25d494882..d254c3c5a0 100644
--- a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
+++ b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From aeee26dcf880c0670381073a9ff2baf808ed7739 Mon Sep 17 00:00:00 2001
+From 3e7b82aceada63cd39219c5a3fdda878a4be6399 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Thu, 22 Mar 2018 01:39:28 -0400
Subject: [PATCH] getPlayerUniqueId API
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 161a714e5..0c519c412 100644
+index 161a714e..0c519c41 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -423,6 +423,20 @@ public final class Bukkit {
@@ -34,7 +34,7 @@ index 161a714e5..0c519c412 100644
* Gets the plugin manager for interfacing with plugins.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 463724e40..8a76df524 100644
+index 463724e4..8a76df52 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -356,6 +356,18 @@ public interface Server extends PluginMessageRecipient {
@@ -57,5 +57,5 @@ index 463724e40..8a76df524 100644
* Gets the plugin manager for interfacing with plugins.
*
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
index 2d842f6a0b..2b8fb636b1 100644
--- a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
+++ b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From 546e453739bd983de0706baf4ec72ac2665ba7d9 Mon Sep 17 00:00:00 2001
+From 6b0a919a4594ce2cfe55bedf3a7faecd0a266887 Mon Sep 17 00:00:00 2001
From: Minecrell
Date: Wed, 11 Oct 2017 19:30:20 +0200
Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent
@@ -8,7 +8,7 @@ client that does not support all of the features provided in the
event.
diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
-index 517d15238..ffda9f6a8 100644
+index 517d1523..ffda9f6a 100644
--- a/src/main/java/com/destroystokyo/paper/network/StatusClient.java
+++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
@@ -10,4 +10,16 @@ import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
@@ -29,5 +29,5 @@ index 517d15238..ffda9f6a8 100644
+
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
index e33913def7..b1d41731d4 100644
--- a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
@@ -1,11 +1,11 @@
-From f695f6cd5a9ee8ca6406f67aed271f8d4288f496 Mon Sep 17 00:00:00 2001
+From 7b106928641e7ae0f15db3f9bbad7e9cff20dea2 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa
Date: Sun, 1 Apr 2018 02:28:43 +0300
Subject: [PATCH] Add method to open already placed sign
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 5b5fb3034..cdbac95bb 100644
+index 5b5fb303..cdbac95b 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -458,4 +458,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -23,5 +23,5 @@ index 5b5fb3034..cdbac95bb 100644
+ // Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
index 913be4a328..e3c003ac72 100644
--- a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
+++ b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch
@@ -1,4 +1,4 @@
-From 9cced81315e6ffdc7f528dae1e86441c53025428 Mon Sep 17 00:00:00 2001
+From 10af44a728883c15bac804518f6f98cf91194944 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sat, 28 Apr 2018 10:28:50 -0400
Subject: [PATCH] Add Ban Methods to Player Objects
@@ -74,7 +74,7 @@ index ffc8ad37..222a9a7b 100644
/**
* Checks if this player is whitelisted or not
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f9a3a3e5..75bbbefd 100644
+index 083110cc..2c6ff39e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3,6 +3,10 @@ package org.bukkit.entity;
@@ -252,5 +252,5 @@ index f9a3a3e5..75bbbefd 100644
/**
* Sends an Action Bar message to the client.
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch
index 913507e4af..11243d6685 100644
--- a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch
+++ b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From 26947b3096d22303635f386434624e373a26bef6 Mon Sep 17 00:00:00 2001
+From 933718c31587aca9f00374ee29bb61c0b844953f Mon Sep 17 00:00:00 2001
From: Aikar
Date: Mon, 30 Apr 2018 13:14:30 -0400
Subject: [PATCH] EndermanEscapeEvent
@@ -9,7 +9,7 @@ You may cancel this, enabling ranged attacks to damage the enderman for example.
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
new file mode 100644
-index 000000000..806112a8b
+index 00000000..806112a8
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
@@ -0,0 +1,87 @@
@@ -101,5 +101,5 @@ index 000000000..806112a8b
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
index 505ef983cb..cd3a9b87a3 100644
--- a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
+++ b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From 0a6883ae1317e0b1348aa136248e692ef3f8f928 Mon Sep 17 00:00:00 2001
+From 22b8e1bb9689bb3b947d2129d699757c7bac34dd Mon Sep 17 00:00:00 2001
From: Aikar
Date: Mon, 30 Apr 2018 13:29:15 -0400
Subject: [PATCH] Enderman.teleportRandomly()
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java
-index bb325d9c8..821c690f8 100644
+index bb325d9c..821c690f 100644
--- a/src/main/java/org/bukkit/entity/Enderman.java
+++ b/src/main/java/org/bukkit/entity/Enderman.java
@@ -10,6 +10,17 @@ import org.jetbrains.annotations.Nullable;
@@ -28,5 +28,5 @@ index bb325d9c8..821c690f8 100644
* Gets the id and data of the block that the Enderman is carrying.
*
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
index 8d4cbe9590..6a82536628 100644
--- a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
+++ b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
@@ -1,4 +1,4 @@
-From 8086435d3bbd0275e9ac6bf4e5d5492e8646e3f7 Mon Sep 17 00:00:00 2001
+From a63e50797c651f9140ab1e0e9fa7a928649d5eab Mon Sep 17 00:00:00 2001
From: Aikar
Date: Mon, 30 Apr 2018 17:55:28 -0400
Subject: [PATCH] Additional world.getNearbyEntities API's
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
Provides more methods to get nearby entities, and filter by types and predicates
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 3cd4bff1..36ec897f 100644
+index 220420ed..bd050368 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1,6 +1,9 @@
@@ -19,7 +19,7 @@ index 3cd4bff1..36ec897f 100644
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
-@@ -586,6 +589,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -583,6 +586,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Collection getEntitiesByClasses(@NotNull Class... classes);
@@ -291,5 +291,5 @@ index 6c09ea6c..76c4a1a6 100644
*/
public void setPlayerProfile(@NotNull PlayerProfile profile) {
--
-2.22.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
index a19491a78b..6d507a8c91 100644
--- a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
+++ b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch
@@ -1,11 +1,11 @@
-From 1c6f930626a0a32fb86db642a2f45cf7dd89e8f1 Mon Sep 17 00:00:00 2001
+From 2e924d63585468de921954ade22acf335dd0d643 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Mon, 30 Apr 2018 19:27:31 -0400
Subject: [PATCH] Location.isChunkLoaded() API
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 44e3bca61..6021e6729 100644
+index 0939a807..6c8b8edd 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -533,6 +533,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -17,5 +17,5 @@ index 44e3bca61..6021e6729 100644
public boolean equals(Object obj) {
if (obj == null) {
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
index 72bb0e1c7a..77a2938dc8 100644
--- a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From dd65b6e6184accfc01cecb26bc44733955544382 Mon Sep 17 00:00:00 2001
+From 17e492080ad5240dbe98e9983b1ae2b96979ad0d Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 29 Aug 2017 23:58:48 -0400
Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use.
diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
new file mode 100644
-index 000000000..06f1602f5
+index 00000000..06f1602f
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
@@ -0,0 +1,478 @@
@@ -493,7 +493,7 @@ index 000000000..06f1602f5
+ }
+}
diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 49467ac70..d2ceb07c7 100644
+index 49467ac7..d2ceb07c 100644
--- a/src/main/java/org/bukkit/Particle.java
+++ b/src/main/java/org/bukkit/Particle.java
@@ -96,6 +96,17 @@ public enum Particle {
@@ -515,10 +515,10 @@ index 49467ac70..d2ceb07c7 100644
* Options which can be applied to redstone dust particles - a particle
* color and size.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b653c695a..548d6d683 100644
+index bd050368..0b357583 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -2286,7 +2286,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2283,7 +2283,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
* the type of this depends on {@link Particle#getDataType()}
* @param Type
*/
@@ -578,5 +578,5 @@ index b653c695a..548d6d683 100644
/**
* Spawns the particle (the number of times specified by count)
--
-2.24.1
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
index 08c469bb5a..467ad282df 100644
--- a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
+++ b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From 6106d1cea7857eaef76610a6bebbab623495d8f1 Mon Sep 17 00:00:00 2001
+From c8c18603ed87388a020dd699aa5c7ab3df054816 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 1 May 2018 20:17:44 -0400
Subject: [PATCH] EndermanAttackPlayerEvent
@@ -9,7 +9,7 @@ This allows you to override/extend the pumpkin/stare logic.
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
new file mode 100644
-index 000000000..f530a3d93
+index 00000000..f530a3d9
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
@@ -0,0 +1,101 @@
@@ -115,5 +115,5 @@ index 000000000..f530a3d93
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
index 26705cfb77..7796f7ab84 100644
--- a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
+++ b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
@@ -1,4 +1,4 @@
-From 14c718e37affff0ccd3d443a988c9d38c332e1ec Mon Sep 17 00:00:00 2001
+From bc1c2155484fd5942bac31d5c13cd77777245af1 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 1 May 2018 21:33:35 -0400
Subject: [PATCH] Close Plugin Class Loaders on Disable
@@ -140,5 +140,5 @@ index 06b6724f..bc7bf6a3 100644
}
}
--
-2.22.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch
index 048530241d..5e2ec94b7a 100644
--- a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch
+++ b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From 46a8a78dfe2160660575ac655af04acb8409bf3b Mon Sep 17 00:00:00 2001
+From 7278c19fd5b1ecef74da0734e3905fd5cf3b9e82 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Wed, 16 May 2018 20:26:16 -0400
Subject: [PATCH] WitchConsumePotionEvent
@@ -7,7 +7,7 @@ Fires when a witch consumes the potion in their hand
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
new file mode 100644
-index 000000000..fbbace36d
+index 00000000..fbbace36
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java
@@ -0,0 +1,70 @@
@@ -83,7 +83,7 @@ index 000000000..fbbace36d
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
new file mode 100644
-index 000000000..6ef6367b6
+index 00000000..6ef6367b
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
@@ -0,0 +1,33 @@
@@ -121,5 +121,5 @@ index 000000000..6ef6367b6
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch
index 022dc37a19..dac7d0878f 100644
--- a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch
+++ b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From 7409e2ec00606be6419f962d16fde6f4b49dfc38 Mon Sep 17 00:00:00 2001
+From 08c8276bbf014d7ef1806907d04db5e70501d396 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Wed, 16 May 2018 20:39:09 -0400
Subject: [PATCH] WitchThrowPotionEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent
Fired when a witch throws a potion at a player
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
-index 6ef6367b6..688a596aa 100644
+index 6ef6367b..688a596a 100644
--- a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
+++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java
@@ -1,29 +1,77 @@
@@ -92,5 +92,5 @@ index 6ef6367b6..688a596aa 100644
@Override
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch
index 29e7a7e946..bac603cf16 100644
--- a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch
+++ b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch
@@ -1,4 +1,4 @@
-From 1f43185dc8047a82ea2c66403d677b4ca4f8cfc5 Mon Sep 17 00:00:00 2001
+From 1917001bc1c9e3128db829877f21dca2ecddc96f Mon Sep 17 00:00:00 2001
From: Aikar
Date: Thu, 24 May 2018 21:01:13 -0400
Subject: [PATCH] Location.toBlockLocation/toCenterLocation()
@@ -6,7 +6,7 @@ Subject: [PATCH] Location.toBlockLocation/toCenterLocation()
Convert location objects to their block coordinates, or the center of the block
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 6021e6729..4f695faf4 100644
+index 6c8b8edd..f61bf28a 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -534,6 +534,31 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -42,5 +42,5 @@ index 6021e6729..4f695faf4 100644
public boolean equals(Object obj) {
if (obj == null) {
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch
index 1d5a255831..052b9fa482 100644
--- a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch
+++ b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch
@@ -1,11 +1,11 @@
-From f88577a3bdbc2c5cee16eaae2605994c72cb4f04 Mon Sep 17 00:00:00 2001
+From 762830b92f0af77bac816faba90a025f178570b2 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sun, 3 Jun 2018 04:10:13 -0400
Subject: [PATCH] PotionEffect clone methods
diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java
-index bbefcd580..0193e0754 100644
+index 60716c62..74767751 100644
--- a/src/main/java/org/bukkit/potion/PotionEffect.java
+++ b/src/main/java/org/bukkit/potion/PotionEffect.java
@@ -101,6 +101,33 @@ public class PotionEffect implements ConfigurationSerializable {
@@ -43,5 +43,5 @@ index bbefcd580..0193e0754 100644
private static PotionEffectType getEffectType(@NotNull Map map) {
int type = getInt(map, TYPE);
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch
index cf0a45271c..6fa560608b 100644
--- a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch
+++ b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch
@@ -1,4 +1,4 @@
-From 5a52559fbf60bbd1d6e0a043654565a9c71b5fd3 Mon Sep 17 00:00:00 2001
+From cdd08698855f82afa01e14e6c9c0b070c369cac9 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 5 Jun 2018 22:47:08 -0400
Subject: [PATCH] WitchReadyPotionEvent
@@ -7,7 +7,7 @@ Control what potion the witch readies to use
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java
new file mode 100644
-index 000000000..5351b523d
+index 00000000..5351b523
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java
@@ -0,0 +1,80 @@
@@ -92,5 +92,5 @@ index 000000000..5351b523d
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch
index e381a95b78..098792c10a 100644
--- a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From 21b8eb1d0a8a24b3b4611a98d2ec0f320ca3cbc7 Mon Sep 17 00:00:00 2001
+From 0a804e62de45bd9c8d9c3b8a716863a961555d6a Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 5 Jun 2018 22:59:50 -0400
Subject: [PATCH] ItemStack#getMaxItemUseDuration
@@ -6,10 +6,10 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
Allows you to determine how long it takes to use a usable/consumable item
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 9526cfe02..f129121e5 100644
+index 65aa1c4e..bb5a4712 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -603,5 +603,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -619,5 +619,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
public String getI18NDisplayName() {
return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
}
@@ -24,5 +24,5 @@ index 9526cfe02..f129121e5 100644
// Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch
index 3a4f9878a9..0eb3c99cee 100644
--- a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From f8bbb5a72a13662f0fea842d909b5a374ed6eef4 Mon Sep 17 00:00:00 2001
+From e97a9fd1b5cd99d2f4787be40f72084f5c3517fe Mon Sep 17 00:00:00 2001
From: Shane Freeder
Date: Sat, 9 Jun 2018 13:08:21 +0100
Subject: [PATCH] Add EntityTeleportEndGatewayEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityTeleportEndGatewayEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java
new file mode 100644
-index 000000000..bfc69a43c
+index 00000000..bfc69a43
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java
@@ -0,0 +1,31 @@
@@ -42,5 +42,5 @@ index 000000000..bfc69a43c
+
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
index e08c11830a..0080ea38a8 100644
--- a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
@@ -1,11 +1,11 @@
-From c5e393bd5a58aeaf2cb0010f5eda86725b843094 Mon Sep 17 00:00:00 2001
+From ec42ead9c4a6ccdeacfa79e586ab6193fa601137 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Sat, 16 Jun 2018 01:17:39 -0500
Subject: [PATCH] Make shield blocking delay configurable
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ffbf3d7a8..e08dfe17f 100644
+index 7e8fc5b3..3e6da797 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -523,5 +523,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -29,5 +29,5 @@ index ffbf3d7a8..e08dfe17f 100644
// Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 1d1ab2af12..2fd1c261ca 100644
--- a/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From ea3b8414bda5855c740871c2eeea1c7a1549ab25 Mon Sep 17 00:00:00 2001
+From 50b638683bcb7ea9e707774b978e2fe39273eb50 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sat, 15 Jun 2013 19:52:04 -0400
Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
Adds ability to get what arrow was shot, and control if it should be consumed.
diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
-index 18c5e31ab..37dbc12eb 100644
+index 18c5e31a..37dbc12e 100644
--- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
@@ -2,6 +2,7 @@ package org.bukkit.event.entity;
@@ -49,5 +49,5 @@ index 18c5e31ab..37dbc12eb 100644
this.projectile = projectile;
this.force = force;
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch b/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch
index a55e8260a0..0801092364 100644
--- a/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch
+++ b/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch
@@ -1,11 +1,11 @@
-From 0217a680b3741df86cb30cf627edda5b961d5a56 Mon Sep 17 00:00:00 2001
+From d7f9ba53cda922d155687508de9cbe5649d52b62 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Mon, 18 Jun 2018 00:41:46 -0500
Subject: [PATCH] Add "getNearbyXXX" methods to Location
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 4f695faf4..5730d5f46 100644
+index f61bf28a..4cf22afc 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -12,6 +12,15 @@ import org.bukkit.util.Vector;
@@ -274,5 +274,5 @@ index 4f695faf4..5730d5f46 100644
@Override
public boolean equals(Object obj) {
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch
index d02df02805..e6679e4353 100644
--- a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch
+++ b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From b605aaf2b947c35c486dc13ed5a1b6a3ebd834aa Mon Sep 17 00:00:00 2001
+From 03c5cb95272596295784f23658d9c1f5c2094996 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Mon, 18 Jun 2018 01:09:27 -0400
Subject: [PATCH] PlayerReadyArrowEvent
@@ -8,7 +8,7 @@ Plugins can skip selection of certain arrows and control which is used.
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java
new file mode 100644
-index 000000000..5d04a22fd
+index 00000000..5d04a22f
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java
@@ -0,0 +1,93 @@
@@ -106,5 +106,5 @@ index 000000000..5d04a22fd
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch
index 7598f24fea..d805d70098 100644
--- a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From 618f5b6f9d4b58eccd1561a5f0da774e0ec15964 Mon Sep 17 00:00:00 2001
+From e225ed9b2fb911a78ef36cb625f75ae376920551 Mon Sep 17 00:00:00 2001
From: Brokkonaut
Date: Mon, 18 Jun 2018 15:40:39 +0200
Subject: [PATCH] Add EntityKnockbackByEntityEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityKnockbackByEntityEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java
new file mode 100644
-index 000000000..9efecabab
+index 00000000..9efecaba
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java
@@ -0,0 +1,82 @@
@@ -93,5 +93,5 @@ index 000000000..9efecabab
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0112-Expand-Explosions-API.patch b/Spigot-API-Patches/0112-Expand-Explosions-API.patch
index e711300660..02e78a2e9f 100644
--- a/Spigot-API-Patches/0112-Expand-Explosions-API.patch
+++ b/Spigot-API-Patches/0112-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 3e08720f1ab03046c754262078e033268f5cef8c Mon Sep 17 00:00:00 2001
+From f8cc53df49e56becb4f871f8205b35b5a2abdd2e Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 19 Dec 2017 16:24:42 -0500
Subject: [PATCH] Expand Explosions API
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
Add Entity as a Source capability, and add more API choices, and on Location.
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 5730d5f46..b226d7e4c 100644
+index 4cf22afc..ac3c8eef 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
@@ -106,10 +106,10 @@ index 5730d5f46..b226d7e4c 100644
* Returns a list of entities within a bounding box centered around a Location.
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index fee0f5211..af5aba4e5 100644
+index 0b357583..b257eda2 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -1305,6 +1305,88 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1302,6 +1302,88 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean createExplosion(@NotNull Location loc, float power, boolean setFire);
@@ -199,5 +199,5 @@ index fee0f5211..af5aba4e5 100644
* Creates explosion at given coordinates with given power and optionally
* setting blocks on fire or breaking blocks.
--
-2.23.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch b/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
index 5fb261604a..cfebf44241 100644
--- a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
@@ -1,11 +1,11 @@
-From fbc63c569cdde9267601ce94726a127cc8fb4d40 Mon Sep 17 00:00:00 2001
+From e5ede7fbb14ecb653eb8874602a8c1d228de6534 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Fri, 22 Jun 2018 22:59:18 -0400
Subject: [PATCH] ItemStack API additions for quantity/flags/lore
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index f129121e5..690abbba2 100644
+index bb5a4712..dfe52817 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -2,7 +2,9 @@ package org.bukkit.inventory;
@@ -18,7 +18,7 @@ index f129121e5..690abbba2 100644
import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit;
import org.bukkit.Material;
-@@ -611,5 +613,140 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -627,5 +629,140 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
// Requires access to NMS
return ensureServerConversions().getMaxItemUseDuration();
}
@@ -160,5 +160,5 @@ index f129121e5..690abbba2 100644
// Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
index 158e3ac631..c35753f1ad 100644
--- a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 6e9e40c6d0ee0a8a456de60396da1e6e365e3a8b Mon Sep 17 00:00:00 2001
+From 72f2d9e3b8b64242408591a1b4f30517ca37fc18 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Fri, 29 Jun 2018 00:19:19 -0400
Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
How long an entity has raised hands to charge an attack or use an item
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index e08dfe17f..6e3284b20 100644
+index 3e6da797..d170149d 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -11,6 +11,7 @@ import org.bukkit.attribute.Attributable;
@@ -51,5 +51,5 @@ index e08dfe17f..6e3284b20 100644
// Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0115-RangedEntity-API.patch b/Spigot-API-Patches/0115-RangedEntity-API.patch
index 4b10cb0f0f..69f96c6d2c 100644
--- a/Spigot-API-Patches/0115-RangedEntity-API.patch
+++ b/Spigot-API-Patches/0115-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From 218499ba97819e3b81c49a13e583dd3185f993c0 Mon Sep 17 00:00:00 2001
+From 2ed512e774f52c88a7f6364aea0912db3ca74585 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 26 Jun 2018 21:34:40 -0400
Subject: [PATCH] RangedEntity API
@@ -8,7 +8,7 @@ and to perform an attack.
diff --git a/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java
new file mode 100644
-index 000000000..f2e3233a3
+index 00000000..f2e3233a
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java
@@ -0,0 +1,31 @@
@@ -44,7 +44,7 @@ index 000000000..f2e3233a3
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Illusioner.java b/src/main/java/org/bukkit/entity/Illusioner.java
-index 7c92c431b..14e6c5ee0 100644
+index 7c92c431..14e6c5ee 100644
--- a/src/main/java/org/bukkit/entity/Illusioner.java
+++ b/src/main/java/org/bukkit/entity/Illusioner.java
@@ -1,6 +1,10 @@
@@ -60,7 +60,7 @@ index 7c92c431b..14e6c5ee0 100644
+
+}
diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java
-index c43854298..d23226ccb 100644
+index c4385429..d23226cc 100644
--- a/src/main/java/org/bukkit/entity/Llama.java
+++ b/src/main/java/org/bukkit/entity/Llama.java
@@ -1,12 +1,13 @@
@@ -79,7 +79,7 @@ index c43854298..d23226ccb 100644
/**
* Represents the base color that the llama has.
diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
-index 16b129388..1c367f78e 100644
+index 16b12938..1c367f78 100644
--- a/src/main/java/org/bukkit/entity/Skeleton.java
+++ b/src/main/java/org/bukkit/entity/Skeleton.java
@@ -2,11 +2,12 @@ package org.bukkit.entity;
@@ -97,7 +97,7 @@ index 16b129388..1c367f78e 100644
/**
* Gets the current type of this skeleton.
diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java
-index 818efe2a4..10f8f6d45 100644
+index 818efe2a..10f8f6d4 100644
--- a/src/main/java/org/bukkit/entity/Snowman.java
+++ b/src/main/java/org/bukkit/entity/Snowman.java
@@ -1,9 +1,11 @@
@@ -114,7 +114,7 @@ index 818efe2a4..10f8f6d45 100644
/**
* Gets whether this snowman is in "derp mode", meaning it is not wearing a
diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java
-index b4343903b..aa88aede6 100644
+index b4343903..aa88aede 100644
--- a/src/main/java/org/bukkit/entity/Witch.java
+++ b/src/main/java/org/bukkit/entity/Witch.java
@@ -1,7 +1,9 @@
@@ -129,7 +129,7 @@ index b4343903b..aa88aede6 100644
+public interface Witch extends Raider, RangedEntity { // Paper
}
diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java
-index 3bc332ee7..426d36933 100644
+index 3bc332ee..426d3693 100644
--- a/src/main/java/org/bukkit/entity/Wither.java
+++ b/src/main/java/org/bukkit/entity/Wither.java
@@ -1,7 +1,9 @@
@@ -143,19 +143,6 @@ index 3bc332ee7..426d36933 100644
-public interface Wither extends Monster, Boss {
+public interface Wither extends Monster, Boss, RangedEntity { // Paper
}
-diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 690abbba2..6d18de762 100644
---- a/src/main/java/org/bukkit/inventory/ItemStack.java
-+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull;
- import org.jetbrains.annotations.Nullable;
-
- /**
-- * Represents a stack of items
-+ * Represents a stack of item
- */
- public class ItemStack implements Cloneable, ConfigurationSerializable {
- private Material type = Material.AIR;
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch
index 992e530bab..339ce00b4a 100644
--- a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch
+++ b/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch
@@ -1,14 +1,14 @@
-From 0bb3c623b122920cdc6ebddc18810ed271f63d76 Mon Sep 17 00:00:00 2001
+From d7084ea0a2a44fed946a7b95cb34a48803b39312 Mon Sep 17 00:00:00 2001
From: Brokkonaut
Date: Tue, 3 Jul 2018 16:07:16 +0200
Subject: [PATCH] Add World.getEntity(UUID) API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 8c767a0b..fec5cdc3 100644
+index b257eda2..260ee11a 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -865,6 +865,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -862,6 +862,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Collection getNearbyEntities(@NotNull Location location, double x, double y, double z);
@@ -27,5 +27,5 @@ index 8c767a0b..fec5cdc3 100644
* Returns a list of entities within a bounding box centered around a
* Location.
--
-2.22.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch
index f03b73d319..46f250cead 100644
--- a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From d60393114fb97bde04cb6af64cabac268418f296 Mon Sep 17 00:00:00 2001
+From 750045b5deeb830c3c24c0d4b61ac581bb972065 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 3 Jul 2018 21:52:52 -0400
Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
to "confirm" things based on if it was player triggered close or not.
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index cdbac95bb..f25c73155 100644
+index cdbac95b..f25c7315 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -152,6 +152,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -27,7 +27,7 @@ index cdbac95bb..f25c73155 100644
* Returns the ItemStack currently in your hand, can be empty.
*
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
-index 5861247c1..21ad8888c 100644
+index 5861247c..21ad8888 100644
--- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
+++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
@@ -11,9 +11,60 @@ import org.jetbrains.annotations.NotNull;
@@ -92,5 +92,5 @@ index 5861247c1..21ad8888c 100644
/**
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0118-Entity-getChunk-API.patch b/Spigot-API-Patches/0118-Entity-getChunk-API.patch
index 763ed7718e..2a52d50a19 100644
--- a/Spigot-API-Patches/0118-Entity-getChunk-API.patch
+++ b/Spigot-API-Patches/0118-Entity-getChunk-API.patch
@@ -1,4 +1,4 @@
-From 11f610016476f57c9873273afa8cf7c3b3dd090c Mon Sep 17 00:00:00 2001
+From 62b86fe6a124b31a9f3b3fdb75f33f77d65d2123 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Wed, 4 Jul 2018 02:25:48 -0400
Subject: [PATCH] Entity#getChunk API
@@ -32,5 +32,5 @@ index bd8507f6..79b94800 100644
// Paper end
}
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch
index e725e28ec4..8acbf2d460 100644
--- a/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch
@@ -1,4 +1,4 @@
-From d259c6119a7d3f5dc6297fa6f71d64cd2c574e5d Mon Sep 17 00:00:00 2001
+From 813ce8218fdf13b0b06e2524ce7fb885b1d2de28 Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Thu, 19 Jul 2018 22:07:02 +0200
Subject: [PATCH] Add an asterisk to legacy API plugins
@@ -63,5 +63,5 @@ index bc7bf6a3..31a70b29 100644
JavaPlugin jPlugin = (JavaPlugin) plugin;
--
-2.24.1.windows.2
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0120-EnderDragon-Events.patch b/Spigot-API-Patches/0120-EnderDragon-Events.patch
index b07ea4ec86..4772b140a9 100644
--- a/Spigot-API-Patches/0120-EnderDragon-Events.patch
+++ b/Spigot-API-Patches/0120-EnderDragon-Events.patch
@@ -1,4 +1,4 @@
-From 9291736c5f854306c0e28f54a9ccacb7b6c44f4c Mon Sep 17 00:00:00 2001
+From 068ee4ed588427a76c7ecdc4818e631ee2923da9 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Sat, 21 Jul 2018 01:51:05 -0500
Subject: [PATCH] EnderDragon Events
@@ -6,7 +6,7 @@ Subject: [PATCH] EnderDragon Events
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
new file mode 100644
-index 000000000..118c7b677
+index 00000000..118c7b67
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java
@@ -0,0 +1,79 @@
@@ -91,7 +91,7 @@ index 000000000..118c7b677
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
new file mode 100644
-index 000000000..1915177f4
+index 00000000..1915177f
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java
@@ -0,0 +1,61 @@
@@ -158,7 +158,7 @@ index 000000000..1915177f4
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
new file mode 100644
-index 000000000..8414bd805
+index 00000000..8414bd80
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java
@@ -0,0 +1,61 @@
@@ -224,5 +224,5 @@ index 000000000..8414bd805
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch
index 7bc3d9e792..3c126ec363 100644
--- a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch
@@ -1,4 +1,4 @@
-From 14fef5c201ad5836364dd92e4ced6ece41fd8307 Mon Sep 17 00:00:00 2001
+From 98089eac14abfb2f9bf938b4c284e22bc6fb31b8 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Sat, 21 Jul 2018 03:10:50 -0500
Subject: [PATCH] PlayerLaunchProjectileEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerLaunchProjectileEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java
new file mode 100644
-index 000000000..9074b2ede
+index 00000000..9074b2ed
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java
@@ -0,0 +1,83 @@
@@ -94,5 +94,5 @@ index 000000000..9074b2ede
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch
index f5b175cf1e..eac4c1f8ab 100644
--- a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch
+++ b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch
@@ -1,4 +1,4 @@
-From 0d1d53de3e2f334b31b55e6d9e42e517aa58d46e Mon Sep 17 00:00:00 2001
+From d0517b8b04774ee52135c914207d2ca44de462b6 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Sat, 21 Jul 2018 01:59:53 -0500
Subject: [PATCH] PlayerElytraBoostEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerElytraBoostEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
new file mode 100644
-index 000000000..e9a76a25f
+index 00000000..e9a76a25
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
@@ -0,0 +1,85 @@
@@ -96,5 +96,5 @@ index 000000000..e9a76a25f
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0123-EntityTransformedEvent.patch b/Spigot-API-Patches/0123-EntityTransformedEvent.patch
index 8afe888b01..898e673d9e 100644
--- a/Spigot-API-Patches/0123-EntityTransformedEvent.patch
+++ b/Spigot-API-Patches/0123-EntityTransformedEvent.patch
@@ -1,4 +1,4 @@
-From d96ebed54e0dba4494e787925a687fccc4711042 Mon Sep 17 00:00:00 2001
+From 06ab69198621ccdff6afe2265068a02fe61838f6 Mon Sep 17 00:00:00 2001
From: Anthony MacAllister
Date: Thu, 26 Jul 2018 15:28:53 -0400
Subject: [PATCH] EntityTransformedEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityTransformedEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
new file mode 100644
-index 000000000..12194f1fc
+index 00000000..12194f1f
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
@@ -0,0 +1,92 @@
@@ -103,5 +103,5 @@ index 000000000..12194f1fc
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch b/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch
index 3f00be53f5..88acf4d68b 100644
--- a/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch
@@ -1,11 +1,11 @@
-From 7801479767131ebf69f057ca215bf2af6570f6b0 Mon Sep 17 00:00:00 2001
+From d96028ef5dcba7e24f0b1d62efcbc758dc48268c Mon Sep 17 00:00:00 2001
From: kashike
Date: Wed, 15 Aug 2018 01:26:03 -0700
Subject: [PATCH] Allow disabling armour stand ticking
diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 387d04e5b..492df420b 100644
+index 387d04e5..492df420 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
@@ -288,5 +288,21 @@ public interface ArmorStand extends LivingEntity {
@@ -31,5 +31,5 @@ index 387d04e5b..492df420b 100644
// Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch
index 4df8d15af7..e91ed6eaed 100644
--- a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch
+++ b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch
@@ -1,4 +1,4 @@
-From 4da8b9ad5af0fce5f7c475e2e5432d2b4553839a Mon Sep 17 00:00:00 2001
+From e8ff87df3e458def0d73bd05a74d322be612ba89 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Fri, 27 Jul 2018 22:36:17 -0500
Subject: [PATCH] SkeletonHorse Additions
@@ -6,7 +6,7 @@ Subject: [PATCH] SkeletonHorse Additions
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
new file mode 100644
-index 000000000..d79dbcd68
+index 00000000..d79dbcd6
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
@@ -0,0 +1,47 @@
@@ -58,7 +58,7 @@ index 000000000..d79dbcd68
+}
+
diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java
-index b2c6b6a86..ba9983463 100644
+index b2c6b6a8..ba998346 100644
--- a/src/main/java/org/bukkit/entity/SkeletonHorse.java
+++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java
@@ -3,4 +3,12 @@ package org.bukkit.entity;
@@ -76,5 +76,5 @@ index b2c6b6a86..ba9983463 100644
+ // Paper end
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch b/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch
index b43ac027b6..5f61d28696 100644
--- a/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch
+++ b/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch
@@ -1,4 +1,4 @@
-From 979c3b5b3d9f1225b81882524a6c19f6f57dcf76 Mon Sep 17 00:00:00 2001
+From 184f233f8797a142cb47aba41a20d815de6a7264 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Wed, 25 Jul 2018 01:36:07 -0400
Subject: [PATCH] Expand Location Manipulation API
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Location Manipulation API
Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z);
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index b226d7e4c..884862ab7 100644
+index ac3c8eef..f87ecd0a 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -546,6 +546,54 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -65,5 +65,5 @@ index b226d7e4c..884862ab7 100644
* @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z)
*/
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch
index b94b80a9ca..fe6a16808f 100644
--- a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch
+++ b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From b178b138b10df28838e9e5d73dcb424ae4fbc38f Mon Sep 17 00:00:00 2001
+From 9e96b61f51f46e55188303f9321ac3d6272e5ecd Mon Sep 17 00:00:00 2001
From: willies952002
Date: Thu, 26 Jul 2018 02:22:44 -0400
Subject: [PATCH] Expand ArmorStand API
@@ -8,7 +8,7 @@ Add the following:
- Enable/Disable slot interactions
diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 492df420b..e7f71e65e 100644
+index 492df420..e7f71e65 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
@@ -1,5 +1,6 @@
@@ -118,5 +118,5 @@ index 492df420b..e7f71e65e 100644
// Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0128-AnvilDamageEvent.patch b/Spigot-API-Patches/0128-AnvilDamageEvent.patch
index fa7f6e1866..fcc5b3f3bf 100644
--- a/Spigot-API-Patches/0128-AnvilDamageEvent.patch
+++ b/Spigot-API-Patches/0128-AnvilDamageEvent.patch
@@ -1,4 +1,4 @@
-From 088e922b17a679192e4544462812259a94e19640 Mon Sep 17 00:00:00 2001
+From a75e25aa2f87e441bce055f45716c5367b0e33f3 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Fri, 20 Jul 2018 23:36:55 -0500
Subject: [PATCH] AnvilDamageEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] AnvilDamageEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
new file mode 100644
-index 000000000..a83c286c1
+index 00000000..a83c286c
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
@@ -0,0 +1,148 @@
@@ -159,5 +159,5 @@ index 000000000..a83c286c1
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch
index 08958d255c..5402649c62 100644
--- a/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch
+++ b/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch
@@ -1,4 +1,4 @@
-From e724746a98cf149f377d9a442782dc448abb8405 Mon Sep 17 00:00:00 2001
+From 1977dda6546322ca3782b8ae3a4951690d74c696 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sun, 9 Sep 2018 00:32:05 -0400
Subject: [PATCH] Remove deadlock risk in firing async events
@@ -16,7 +16,7 @@ which results in a hard crash.
This change removes the synchronize and adds some protection around enable/disable
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index adca48f1..2d3cee14 100644
+index 79b94800..04365232 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
@@ -138,5 +138,5 @@ index 17dbe913..bae26ce7 100644
@Test
public void testRemovePermissionByNameLower() {
--
-2.22.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch b/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch
index 75b75f5369..6394bedfe9 100644
--- a/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch
+++ b/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch
@@ -1,4 +1,4 @@
-From f4903a698923d47c5e8fc9b761fefd19d7646c1a Mon Sep 17 00:00:00 2001
+From 220d3a708bf84b7d69b8f6aaf1750de40fc40af1 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Thu, 2 Aug 2018 08:44:20 -0500
Subject: [PATCH] Add hand to bucket events
@@ -129,5 +129,5 @@ index 77c3a6e5..56f1cc2d 100644
@Override
public HandlerList getHandlers() {
--
-2.23.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch
index b077a441fc..5de7ce7465 100644
--- a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch
+++ b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch
@@ -1,4 +1,4 @@
-From 90f823790371eef1c765d366a69f725c7dc628e0 Mon Sep 17 00:00:00 2001
+From 709bb119e62b1a44c62bd9ea69f9035365cb2fc7 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa
Date: Sun, 15 Jul 2018 22:17:55 +0300
Subject: [PATCH] Add TNTPrimeEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
new file mode 100644
-index 000000000..73dabb82c
+index 00000000..73dabb82
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
@@ -0,0 +1,114 @@
@@ -125,5 +125,5 @@ index 000000000..73dabb82c
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch
index 04e9f88f0a..3a7ddcc9f9 100644
--- a/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch
@@ -1,4 +1,4 @@
-From 13d88336c734b2f4d7ec780cd4170c29bd517273 Mon Sep 17 00:00:00 2001
+From b20a912f73626ff663ee63c603cef6b7bd38a601 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sat, 4 Aug 2018 19:37:35 -0400
Subject: [PATCH] Provide Chunk Coordinates as a Long API
@@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method
to look up by the long key too.
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index 95e485eea..0bbef14a9 100644
+index 95e485ee..0bbef14a 100644
--- a/src/main/java/org/bukkit/Chunk.java
+++ b/src/main/java/org/bukkit/Chunk.java
@@ -27,6 +27,32 @@ public interface Chunk {
@@ -44,10 +44,10 @@ index 95e485eea..0bbef14a9 100644
* Gets the world containing this chunk
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 98f416455..b80b8b3b6 100644
+index 260ee11a..abd469b5 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -158,6 +158,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -155,6 +155,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Chunk getChunkAt(@NotNull Block block);
@@ -71,5 +71,5 @@ index 98f416455..b80b8b3b6 100644
* Checks if the specified {@link Chunk} is loaded
*
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0133-Async-Chunks-API.patch b/Spigot-API-Patches/0133-Async-Chunks-API.patch
index 5534e0527a..308c9f9cbe 100644
--- a/Spigot-API-Patches/0133-Async-Chunks-API.patch
+++ b/Spigot-API-Patches/0133-Async-Chunks-API.patch
@@ -1,4 +1,4 @@
-From e9382947de5cb8b5bc680815fe9bc811b59ef058 Mon Sep 17 00:00:00 2001
+From b58f65b305f5d0822f5802442a400a92f1ef7504 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Mon, 29 Feb 2016 17:43:33 -0600
Subject: [PATCH] Async Chunks API
@@ -8,10 +8,10 @@ Adds API's to load or generate chunks asynchronously.
Also adds utility methods to Entity to teleport asynchronously.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b80b8b3b..7a0b66fe 100644
+index abd469b5..310041ae 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -172,6 +172,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -169,6 +169,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
public default Chunk getChunkAt(long chunkKey) {
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
}
@@ -371,7 +371,7 @@ index b80b8b3b..7a0b66fe 100644
/**
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index e5756c42..da7b35f0 100644
+index 04365232..83e02aea 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -155,6 +155,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -406,5 +406,5 @@ index e5756c42..da7b35f0 100644
* Returns a list of entities within a bounding box centered around this
* entity
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch
index b7706194c2..94b1b385a6 100644
--- a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch
+++ b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch
@@ -1,11 +1,11 @@
-From d2d7daccfc4a156c7a476d350e50e2f5b933f8d6 Mon Sep 17 00:00:00 2001
+From 6b5294396cb7b80079abf2691ff673493fbb5bfe Mon Sep 17 00:00:00 2001
From: Aikar
Date: Fri, 10 Aug 2018 22:08:34 -0400
Subject: [PATCH] Make EnderDragon extend Mob
diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java
-index 16199b3e9..ddef550bb 100644
+index 16199b3e..ddef550b 100644
--- a/src/main/java/org/bukkit/entity/EnderDragon.java
+++ b/src/main/java/org/bukkit/entity/EnderDragon.java
@@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull;
@@ -18,5 +18,5 @@ index 16199b3e9..ddef550bb 100644
/**
* Represents a phase or action that an Ender Dragon can perform.
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 5762c67eb1..4f91516b1a 100644
--- a/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,11 +1,11 @@
-From 7c0eaa2f5e46b50360b8fa61518f57f5af913e00 Mon Sep 17 00:00:00 2001
+From ee8f4f1a0a6a9d3f20a4b1f4560ede1dbcb89116 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Wed, 15 Aug 2018 01:04:58 -0400
Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index 7b0424d5..7909caef 100644
+index 0bbef14a..11b691cf 100644
--- a/src/main/java/org/bukkit/Chunk.java
+++ b/src/main/java/org/bukkit/Chunk.java
@@ -102,13 +102,26 @@ public interface Chunk {
@@ -37,5 +37,5 @@ index 7b0424d5..7909caef 100644
/**
* Checks if the chunk is loaded.
--
-2.23.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
index 9a5197468b..fb7c6e66b4 100644
--- a/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
+++ b/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
@@ -1,11 +1,11 @@
-From 6a2e800f2e25eeb4229cc452f3b83bd5683d0cdd Mon Sep 17 00:00:00 2001
+From 9d25b9ff0418113653a0ec9a3fde1280b7742f0f Mon Sep 17 00:00:00 2001
From: Aikar
Date: Wed, 15 Aug 2018 01:19:37 -0400
Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports
diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
-index ddaed8127..203cda0f9 100644
+index ddaed812..203cda0f 100644
--- a/src/main/java/co/aikar/timings/TimingHistory.java
+++ b/src/main/java/co/aikar/timings/TimingHistory.java
@@ -119,7 +119,7 @@ public class TimingHistory {
@@ -18,5 +18,5 @@ index ddaed8127..203cda0f9 100644
Bukkit.getLogger().warning("Null tileentity detected in chunk at position x: " + chunk.getX() + ", z: " + chunk.getZ());
continue;
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch
index 0952961514..61cc1f4e5b 100644
--- a/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -1,4 +1,4 @@
-From 039fde9628b4eb210babf96765eb25678fda8959 Mon Sep 17 00:00:00 2001
+From f440565394b29fc10255bf6770adaead86eac9b7 Mon Sep 17 00:00:00 2001
From: Spottedleaf
Date: Tue, 14 Aug 2018 21:42:10 -0700
Subject: [PATCH] Allow Blocks to be accessed via a long key
@@ -18,7 +18,7 @@ Y range: [0, 1023]
X, Z range: [-67 108 864, 67 108 863]
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 884862ab..6dc39989 100644
+index f87ecd0a..07e532cd 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -15,7 +15,6 @@ import org.jetbrains.annotations.Nullable;
@@ -48,7 +48,7 @@ index 884862ab..6dc39989 100644
* @return A new location where X/Y/Z are the center of the block
*/
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d4fcbf60..ce128016 100644
+index 310041ae..5bf2ba6f 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -89,6 +89,38 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -88,8 +88,8 @@ index d4fcbf60..ce128016 100644
+ // Paper end
+
/**
- * Gets the y coordinate of the lowest block at this position such that the
- * block and all blocks above it are transparent for lighting purposes.
+ * Gets the highest non-empty (impassable) coordinate at the given
+ * coordinates.
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index af4ffada..87185a81 100644
--- a/src/main/java/org/bukkit/block/Block.java
@@ -168,5 +168,5 @@ index af4ffada..87185a81 100644
* Gets the Location of the block
*
--
-2.22.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch
index e91b19491a..51c8b6f26a 100644
--- a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch
+++ b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch
@@ -1,4 +1,4 @@
-From ed6de598138774849832bd9edef9d2a1fc71eab5 Mon Sep 17 00:00:00 2001
+From ecb8e3fef8742116a4ee2ae296cb96d7bd7bd7db Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Fri, 24 Aug 2018 08:18:27 -0500
Subject: [PATCH] Slime Pathfinder Events
@@ -6,7 +6,7 @@ Subject: [PATCH] Slime Pathfinder Events
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java
new file mode 100644
-index 000000000..2638bbd3e
+index 00000000..2638bbd3
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java
@@ -0,0 +1,38 @@
@@ -50,7 +50,7 @@ index 000000000..2638bbd3e
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java
new file mode 100644
-index 000000000..14b67da10
+index 00000000..14b67da1
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java
@@ -0,0 +1,53 @@
@@ -109,7 +109,7 @@ index 000000000..14b67da10
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java
new file mode 100644
-index 000000000..c8dd49d11
+index 00000000..c8dd49d1
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java
@@ -0,0 +1,17 @@
@@ -132,7 +132,7 @@ index 000000000..c8dd49d11
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java
new file mode 100644
-index 000000000..e9ba32799
+index 00000000..e9ba3279
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java
@@ -0,0 +1,31 @@
@@ -169,7 +169,7 @@ index 000000000..e9ba32799
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java
new file mode 100644
-index 000000000..4683a7237
+index 00000000..4683a723
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java
@@ -0,0 +1,17 @@
@@ -191,7 +191,7 @@ index 000000000..4683a7237
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java
-index 1119e26e2..c4791f95d 100644
+index 1119e26e..c4791f95 100644
--- a/src/main/java/org/bukkit/entity/Slime.java
+++ b/src/main/java/org/bukkit/entity/Slime.java
@@ -14,4 +14,20 @@ public interface Slime extends Mob {
@@ -216,5 +216,5 @@ index 1119e26e2..c4791f95d 100644
+ // Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0139-isChunkGenerated-API.patch b/Spigot-API-Patches/0139-isChunkGenerated-API.patch
index b0a2f6c48c..549da0797a 100644
--- a/Spigot-API-Patches/0139-isChunkGenerated-API.patch
+++ b/Spigot-API-Patches/0139-isChunkGenerated-API.patch
@@ -1,11 +1,11 @@
-From bebdec693bd0350c7d1be2671eb057542d66db03 Mon Sep 17 00:00:00 2001
+From 6d81881cbf9b5eca26d514dd5397735659b33f18 Mon Sep 17 00:00:00 2001
From: cswhite2000 <18whitechristop@gmail.com>
Date: Tue, 21 Aug 2018 19:39:46 -0700
Subject: [PATCH] isChunkGenerated API
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 6dc39989..4e69f277 100644
+index 07e532cd..6e1a1124 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -3,6 +3,7 @@ package org.bukkit;
@@ -34,10 +34,10 @@ index 6dc39989..4e69f277 100644
/**
* Sets the position of this Location and returns itself
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index ce128016..30b3d9a8 100644
+index 5bf2ba6f..c6e2efc3 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -205,6 +205,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -202,6 +202,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
}
@@ -56,5 +56,5 @@ index ce128016..30b3d9a8 100644
* This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
* as well as future support
--
-2.22.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch
index 7167a9ece2..a943b06f49 100644
--- a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch
+++ b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch
@@ -1,4 +1,4 @@
-From 5c03633065ac302e4f78d956c5f60db96d36fa2e Mon Sep 17 00:00:00 2001
+From 6a721495ed80e20ab76fe910f0f76863f0edaec8 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Fri, 24 Aug 2018 11:50:16 -0500
Subject: [PATCH] Add More Creeper API
@@ -6,7 +6,7 @@ Subject: [PATCH] Add More Creeper API
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
new file mode 100644
-index 000000000..ff10251b6
+index 00000000..ff10251b
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
@@ -0,0 +1,54 @@
@@ -65,7 +65,7 @@ index 000000000..ff10251b6
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java
-index 1b8ece6df..faaeb44a9 100644
+index 1b8ece6d..faaeb44a 100644
--- a/src/main/java/org/bukkit/entity/Creeper.java
+++ b/src/main/java/org/bukkit/entity/Creeper.java
@@ -71,4 +71,27 @@ public interface Creeper extends Monster {
@@ -97,5 +97,5 @@ index 1b8ece6df..faaeb44a9 100644
+ // Paper end
}
--
-2.22.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch
index d418013c4e..737eeaf3ea 100644
--- a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch
@@ -1,4 +1,4 @@
-From ed1259f134b0a6143623059aede383ba25b62c4e Mon Sep 17 00:00:00 2001
+From 5cf14e4f082f4a8bd55053a045f5e94640c76436 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Sat, 25 Aug 2018 19:56:42 -0500
Subject: [PATCH] Add PhantomPreSpawnEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PhantomPreSpawnEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java
new file mode 100644
-index 000000000..9022f697a
+index 00000000..9022f697
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java
@@ -0,0 +1,31 @@
@@ -42,7 +42,7 @@ index 000000000..9022f697a
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java
-index 1a1044edc..ed4d417c2 100644
+index 1a1044ed..ed4d417c 100644
--- a/src/main/java/org/bukkit/entity/Phantom.java
+++ b/src/main/java/org/bukkit/entity/Phantom.java
@@ -1,5 +1,8 @@
@@ -70,5 +70,5 @@ index 1a1044edc..ed4d417c2 100644
+ // Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch
index 3899674b93..e34c831c75 100644
--- a/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch
+++ b/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch
@@ -1,11 +1,11 @@
-From b0f398fcc65b5e54c6b3711c8e2b3f180791846d Mon Sep 17 00:00:00 2001
+From f19f62a22ecc44d92b5f0e3e2e85b40e686e3a44 Mon Sep 17 00:00:00 2001
From: Sotr
Date: Thu, 23 Aug 2018 16:14:25 +0800
Subject: [PATCH] Add source block to BlockPhysicsEvent
diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
-index e3a5f5824..c382f9fc2 100644
+index e3a5f582..c382f9fc 100644
--- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
@@ -32,6 +32,13 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
@@ -23,5 +23,5 @@ index e3a5f5824..c382f9fc2 100644
this(block, changed, block);
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch
index eb5369c71d..7c95f9f215 100644
--- a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch
+++ b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch
@@ -1,11 +1,11 @@
-From d70b874cdd62803c5044a849ea6de1ee156a623d Mon Sep 17 00:00:00 2001
+From 95a43e8a08966b71f9c27280888bc7a60f551d39 Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Tue, 28 Aug 2018 23:04:06 -0400
Subject: [PATCH] Inventory#removeItemAnySlot
diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java
-index 5a38d8f13..01fe217df 100644
+index 5a38d8f1..01fe217d 100644
--- a/src/main/java/org/bukkit/inventory/Inventory.java
+++ b/src/main/java/org/bukkit/inventory/Inventory.java
@@ -125,6 +125,34 @@ public interface Inventory extends Iterable {
@@ -44,5 +44,5 @@ index 5a38d8f13..01fe217df 100644
* Returns all ItemStacks from the inventory
*
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch
index 686f5f75ae..a8cedab59d 100644
--- a/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From 1bbdf437d44208ea4bd632bfa6503b67d1ddc160 Mon Sep 17 00:00:00 2001
+From 9fc1f2c6f1a03513613095a656e8b713d24ffe47 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Mon, 3 Sep 2018 18:13:53 -0500
Subject: [PATCH] Add ray tracing methods to LivingEntity
@@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
new file mode 100644
-index 000000000..18a96dbb0
+index 00000000..18a96dbb
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
@@ -0,0 +1,54 @@
@@ -65,7 +65,7 @@ index 000000000..18a96dbb0
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 6e3284b20..9dc0d4ce3 100644
+index d170149d..3110c385 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -81,6 +81,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -147,5 +147,5 @@ index 6e3284b20..9dc0d4ce3 100644
* Gets the last two blocks along the living entity's line of sight.
*
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0145-Improve-death-events.patch b/Spigot-API-Patches/0145-Improve-death-events.patch
index 9e1c5f66fa..405b940824 100644
--- a/Spigot-API-Patches/0145-Improve-death-events.patch
+++ b/Spigot-API-Patches/0145-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 79c433161d95f5eae0abf6fbdfa003097fdd4750 Mon Sep 17 00:00:00 2001
+From c5a15df263aed995ea36ac14c7b9bfa0a8db5d08 Mon Sep 17 00:00:00 2001
From: Phoenix616
Date: Tue, 21 Aug 2018 01:32:28 +0100
Subject: [PATCH] Improve death events
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
internal code.
diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
-index a5984ab06..e19a3df9a 100644
+index a5984ab0..e19a3df9 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
@@ -5,14 +5,24 @@ import org.bukkit.entity.LivingEntity;
@@ -180,5 +180,5 @@ index a5984ab06..e19a3df9a 100644
+ // Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch
index 2eeb7eae0f..9236cb87e5 100644
--- a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch
+++ b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 6538047548e090bb6c665f548411a53a52b466e0 Mon Sep 17 00:00:00 2001
+From 8c61dbfb7e69abe9e11960cca8798a51e0fe13d2 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sun, 9 Sep 2018 12:39:06 -0400
Subject: [PATCH] Mob Pathfinding API
@@ -13,7 +13,7 @@ You can use EntityPathfindEvent to cancel new pathfinds from overriding your cur
diff --git a/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java
new file mode 100644
-index 000000000..8b90a9053
+index 00000000..8b90a905
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java
@@ -0,0 +1,170 @@
@@ -188,7 +188,7 @@ index 000000000..8b90a9053
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index 838440ff8..afdc103fe 100644
+index 838440ff..afdc103f 100644
--- a/src/main/java/org/bukkit/entity/Mob.java
+++ b/src/main/java/org/bukkit/entity/Mob.java
@@ -1,6 +1,7 @@
@@ -216,5 +216,5 @@ index 838440ff8..afdc103fe 100644
* Instructs this Mob to set the specified LivingEntity as its target.
*
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch
index e84843c219..7dd7aeeb0d 100644
--- a/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,4 +1,4 @@
-From d71fc46cccb94a231e306971414184d56ab42747 Mon Sep 17 00:00:00 2001
+From e38ab8ea9596208adf8125bc2630a36480621435 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Tue, 4 Sep 2018 15:01:54 -0500
Subject: [PATCH] Expose attack cooldown methods for Player
@@ -36,5 +36,5 @@ index 2c6ff39e..7f771b35 100644
// Spigot start
--
-2.25.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index ca5cc8cbfd..3b9ba80335 100644
--- a/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -1,4 +1,4 @@
-From 45b3ed4d07d28d39b41e0154719bacb84d073413 Mon Sep 17 00:00:00 2001
+From c32da3b257eba8d2fd666e0b9fbb6826265441e3 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa
Date: Wed, 12 Sep 2018 18:53:35 +0300
Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values
@@ -226,7 +226,7 @@ index 22eca2a1..620a962d 100644
return key;
}
diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 1df31be7..b1fa15a1 100644
+index f2e9f275..7e0b1d36 100644
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
@@ -388,4 +388,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
@@ -318,5 +318,5 @@ index 1df31be7..b1fa15a1 100644
+ // Paper end
}
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch b/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch
index c26576e115..5ad437367b 100644
--- a/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch
+++ b/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch
@@ -1,4 +1,4 @@
-From 03939964d3b449b2f50848f67b7afcef215ed67e Mon Sep 17 00:00:00 2001
+From 84a87fd799e1ceaeedc4924323664331c6bd14b0 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Thu, 13 Sep 2018 20:51:50 -0400
Subject: [PATCH] Performance & Concurrency Improvements to Permissions
@@ -18,7 +18,7 @@ Optimized it to simply be a single get call cutting permission map
lookups in half.
diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java
-index 497775f7f..c94e4cdb5 100644
+index 497775f7..c94e4cdb 100644
--- a/src/main/java/org/bukkit/permissions/PermissibleBase.java
+++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java
@@ -75,8 +75,11 @@ public class PermissibleBase implements Permissible {
@@ -112,5 +112,5 @@ index 497775f7f..c94e4cdb5 100644
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch
index 2a54dc263b..eeac1c3b47 100644
--- a/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch
+++ b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch
@@ -1,4 +1,4 @@
-From 7623f58212aed74956a8d56b287b1e43c7ed3bb7 Mon Sep 17 00:00:00 2001
+From 48d7033d5636f973e7c0866bf74610ac7aa22fd4 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Thu, 13 Sep 2018 21:39:26 -0400
Subject: [PATCH] Add ItemStackRecipeChoice Draft API
@@ -9,7 +9,7 @@ Allows creating recipes that must match isSimilar to full item stack.
diff --git a/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
new file mode 100644
-index 000000000..43e6576b1
+index 00000000..43e6576b
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
@@ -0,0 +1,51 @@
@@ -65,5 +65,5 @@ index 000000000..43e6576b1
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch
index c73d4ff502..cc71a54828 100644
--- a/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 98e9c2527d5e5f0e2c66fcd4bbf746eb1c3bc22f Mon Sep 17 00:00:00 2001
+From 4a2dfd6dc85fd5e72a95c4bff2c08e81ffbf3ba7 Mon Sep 17 00:00:00 2001
From: Tassu
Date: Thu, 13 Sep 2018 08:45:01 +0300
Subject: [PATCH] Implement furnace cook speed multiplier API
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API
Signed-off-by: Tassu
diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java
-index c5a8c96fa..9063cf370 100644
+index c5a8c96f..9063cf37 100644
--- a/src/main/java/org/bukkit/block/Furnace.java
+++ b/src/main/java/org/bukkit/block/Furnace.java
@@ -61,6 +61,26 @@ public interface Furnace extends Container {
@@ -37,5 +37,5 @@ index c5a8c96fa..9063cf370 100644
@Override
public FurnaceInventory getInventory();
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch
index 7730af6f5b..158ff2ebe8 100644
--- a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch
+++ b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 35108f571ea410480d74da2013f658c1a286717e Mon Sep 17 00:00:00 2001
+From e5c7c371568b1dca84252ec87bc6c14933dc34d0 Mon Sep 17 00:00:00 2001
From: Phoenix616
Date: Tue, 18 Sep 2018 23:50:10 +0100
Subject: [PATCH] PreSpawnerSpawnEvent
@@ -10,7 +10,7 @@ spawners.
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
new file mode 100644
-index 000000000..48cff0635
+index 00000000..48cff063
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java
@@ -0,0 +1,29 @@
@@ -44,5 +44,5 @@ index 000000000..48cff0635
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch b/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch
index 21b8fdd777..e9ecd7ffea 100644
--- a/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch
+++ b/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch
@@ -1,4 +1,4 @@
-From 8f9018e6a58b04dc2a4ffc194859a002a64cf222 Mon Sep 17 00:00:00 2001
+From 7bebab90baccc66d9abbb59bdd963bc9e13d02e1 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sat, 22 Sep 2018 18:41:01 -0400
Subject: [PATCH] Remove Precondition on name for AttributeModifier
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove Precondition on name for AttributeModifier
Vanilla allows empty names
diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-index a97631474..f0dff145a 100644
+index a9763147..f0dff145 100644
--- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
+++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
@@ -32,10 +32,10 @@ public class AttributeModifier implements ConfigurationSerializable {
@@ -23,5 +23,5 @@ index a97631474..f0dff145a 100644
this.operation = operation;
this.slot = slot;
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0154-Material-API-additions.patch b/Spigot-API-Patches/0154-Material-API-additions.patch
index a3cde3eca3..6c86fe16b3 100644
--- a/Spigot-API-Patches/0154-Material-API-additions.patch
+++ b/Spigot-API-Patches/0154-Material-API-additions.patch
@@ -1,4 +1,4 @@
-From 48215f315183e9ee6f9f6c31a8072e9094cbfb60 Mon Sep 17 00:00:00 2001
+From 7e722bdbd8f3b45278cb3a069b09aa82a50cceda Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sat, 6 Oct 2018 21:14:29 -0400
Subject: [PATCH] Material API additions
@@ -40,5 +40,5 @@ index 9dc0ed03..535179c2 100644
* Do not use for any reason.
*
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0155-Add-Material-Tags.patch b/Spigot-API-Patches/0155-Add-Material-Tags.patch
index 053cd22cbb..fcefd93965 100644
--- a/Spigot-API-Patches/0155-Add-Material-Tags.patch
+++ b/Spigot-API-Patches/0155-Add-Material-Tags.patch
@@ -1,4 +1,4 @@
-From b0bcbd742cd31fe87bde4791e386dc1f85bc14a2 Mon Sep 17 00:00:00 2001
+From d0f5f71e226dd33834551fa47a3a4a605264647b Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 17 Jul 2018 01:27:15 -0400
Subject: [PATCH] Add Material Tags
@@ -635,5 +635,5 @@ index 61993528..5f9d3482 100644
Server.class.getMethod("getPluginManager"),
new MethodHandler() {
--
-2.24.1
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch b/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch
index 9b09d117a1..89855fbf66 100644
--- a/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch
@@ -1,11 +1,11 @@
-From 8a5ed8af917559e92ff5030c6060dcc713070b06 Mon Sep 17 00:00:00 2001
+From 6e1384d706d338edc012cc11eb6b81a464c8e2f6 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Sat, 6 Oct 2018 21:47:09 -0500
Subject: [PATCH] Allow setting the vex's summoner
diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java
-index 6b61c4ab7..c34a3ea7b 100644
+index 6b61c4ab..c34a3ea7 100644
--- a/src/main/java/org/bukkit/entity/Vex.java
+++ b/src/main/java/org/bukkit/entity/Vex.java
@@ -1,5 +1,7 @@
@@ -39,5 +39,5 @@ index 6b61c4ab7..c34a3ea7b 100644
+ // Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch
index 0d9c143921..f4f9ca3360 100644
--- a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch
@@ -1,4 +1,4 @@
-From 02581e05349fbe72c968c075e13c2ce24f0ea8a0 Mon Sep 17 00:00:00 2001
+From 23517bc468b2b7651e9672d2c6e91bcb6bed2106 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Sat, 22 Sep 2018 00:32:53 -0500
Subject: [PATCH] Add LivingEntity#getTargetEntity
@@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
new file mode 100644
-index 000000000..f52644fab
+index 00000000..f52644fa
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
@@ -0,0 +1,38 @@
@@ -49,7 +49,7 @@ index 000000000..f52644fab
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 9dc0d4ce3..a78f390d7 100644
+index 3110c385..240f276c 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -150,6 +150,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -104,5 +104,5 @@ index 9dc0d4ce3..a78f390d7 100644
/**
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0158-Add-sun-related-API.patch b/Spigot-API-Patches/0158-Add-sun-related-API.patch
index ea35a48e68..2481a0dc62 100644
--- a/Spigot-API-Patches/0158-Add-sun-related-API.patch
+++ b/Spigot-API-Patches/0158-Add-sun-related-API.patch
@@ -1,14 +1,14 @@
-From 2da2459f920db384979afaf261bf21c33bf24bb7 Mon Sep 17 00:00:00 2001
+From f8fa7eb584dab2c32c88b92bbedc705f6540581c Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Sun, 7 Oct 2018 00:54:15 -0500
Subject: [PATCH] Add sun related API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 30b3d9a8..b02cda3e 100644
+index c6e2efc3..23c76976 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -1597,6 +1597,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1594,6 +1594,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public void setFullTime(long time);
@@ -44,5 +44,5 @@ index afdc103f..784db447 100644
/**
--
-2.22.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0159-Here-s-Johnny.patch b/Spigot-API-Patches/0159-Here-s-Johnny.patch
index bfc6453bed..e126a2a7ea 100644
--- a/Spigot-API-Patches/0159-Here-s-Johnny.patch
+++ b/Spigot-API-Patches/0159-Here-s-Johnny.patch
@@ -1,11 +1,11 @@
-From 9feb8537560450fdcad63b1b2779325380c7a425 Mon Sep 17 00:00:00 2001
+From 55e5b39866ee0b4122d18ccc260ea6c6fd14cb68 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Fri, 12 Oct 2018 01:37:16 -0500
Subject: [PATCH] Here's Johnny!
diff --git a/src/main/java/org/bukkit/entity/Vindicator.java b/src/main/java/org/bukkit/entity/Vindicator.java
-index b8ea68a8f..c5d9e76a6 100644
+index b8ea68a8..c5d9e76a 100644
--- a/src/main/java/org/bukkit/entity/Vindicator.java
+++ b/src/main/java/org/bukkit/entity/Vindicator.java
@@ -3,4 +3,30 @@ package org.bukkit.entity;
@@ -41,5 +41,5 @@ index b8ea68a8f..c5d9e76a6 100644
+ // Paper end
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0160-Turtle-API.patch b/Spigot-API-Patches/0160-Turtle-API.patch
index 0905f052d7..e17fb6621a 100644
--- a/Spigot-API-Patches/0160-Turtle-API.patch
+++ b/Spigot-API-Patches/0160-Turtle-API.patch
@@ -1,4 +1,4 @@
-From afddee2d418aabde079f27f71fc4e551f915b42c Mon Sep 17 00:00:00 2001
+From fb0f440061d118e2b2a67e4bef904a44e4606157 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Fri, 28 Sep 2018 17:08:09 -0500
Subject: [PATCH] Turtle API
@@ -6,7 +6,7 @@ Subject: [PATCH] Turtle API
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
new file mode 100644
-index 000000000..021356d15
+index 00000000..021356d1
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
@@ -0,0 +1,49 @@
@@ -61,7 +61,7 @@ index 000000000..021356d15
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
new file mode 100644
-index 000000000..a315c5185
+index 00000000..a315c518
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
@@ -0,0 +1,87 @@
@@ -154,7 +154,7 @@ index 000000000..a315c5185
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
new file mode 100644
-index 000000000..abeb24fcc
+index 00000000..abeb24fc
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
@@ -0,0 +1,62 @@
@@ -221,7 +221,7 @@ index 000000000..abeb24fcc
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java
-index 0a4cd2993..5375ea140 100644
+index 0a4cd299..5375ea14 100644
--- a/src/main/java/org/bukkit/entity/Turtle.java
+++ b/src/main/java/org/bukkit/entity/Turtle.java
@@ -1,6 +1,55 @@
@@ -282,5 +282,5 @@ index 0a4cd2993..5375ea140 100644
+ // Paper end
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 16935788d9..eeb36f19c0 100644
--- a/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From 3fa0f5cbf8659b7e8db5bcf93b95f01a6102a11f Mon Sep 17 00:00:00 2001
+From 1dbe5e0546a661b121c82a839d2f5b99fda98035 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Sat, 6 Oct 2018 20:54:13 -0500
Subject: [PATCH] Implement getters and setters for EntityItem owner and
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and
diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index cb9e9f369..a15f70ff4 100644
+index cb9e9f36..a15f70ff 100644
--- a/src/main/java/org/bukkit/entity/Item.java
+++ b/src/main/java/org/bukkit/entity/Item.java
@@ -4,6 +4,10 @@ import org.bukkit.inventory.ItemStack;
@@ -57,5 +57,5 @@ index cb9e9f369..a15f70ff4 100644
// Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0162-Add-spectator-target-events.patch b/Spigot-API-Patches/0162-Add-spectator-target-events.patch
index 971c24fc21..3c21fbed4a 100644
--- a/Spigot-API-Patches/0162-Add-spectator-target-events.patch
+++ b/Spigot-API-Patches/0162-Add-spectator-target-events.patch
@@ -1,4 +1,4 @@
-From 52e7ac31dedf5afa861d6a5cb99977fe77a8d279 Mon Sep 17 00:00:00 2001
+From 41a09f927d69e558a5dc223da54cc2a7ee8e39a1 Mon Sep 17 00:00:00 2001
From: Caleb Bassham
Date: Fri, 28 Sep 2018 02:30:56 -0500
Subject: [PATCH] Add spectator target events
@@ -8,7 +8,7 @@ Subject: [PATCH] Add spectator target events
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java
new file mode 100644
-index 000000000..b8ec7ef2d
+index 00000000..b8ec7ef2
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java
@@ -0,0 +1,67 @@
@@ -81,7 +81,7 @@ index 000000000..b8ec7ef2d
+
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java
new file mode 100644
-index 000000000..693d119ab
+index 00000000..693d119a
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java
@@ -0,0 +1,54 @@
@@ -140,5 +140,5 @@ index 000000000..693d119ab
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0163-Add-more-Witch-API.patch b/Spigot-API-Patches/0163-Add-more-Witch-API.patch
index 29905112ad..62d9f4ed6f 100644
--- a/Spigot-API-Patches/0163-Add-more-Witch-API.patch
+++ b/Spigot-API-Patches/0163-Add-more-Witch-API.patch
@@ -1,11 +1,11 @@
-From cf294a7cb160aee89d26509009c13b9415132a73 Mon Sep 17 00:00:00 2001
+From d4957c651a67e0bea676153a8d426681e9d43990 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Fri, 12 Oct 2018 03:47:26 -0500
Subject: [PATCH] Add more Witch API
diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java
-index aa88aede6..cd8d0a20e 100644
+index aa88aede..cd8d0a20 100644
--- a/src/main/java/org/bukkit/entity/Witch.java
+++ b/src/main/java/org/bukkit/entity/Witch.java
@@ -2,8 +2,43 @@ package org.bukkit.entity;
@@ -53,5 +53,5 @@ index aa88aede6..cd8d0a20e 100644
+ // Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch
index 2194f75ce5..04151e0cdf 100644
--- a/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch
@@ -1,11 +1,11 @@
-From 522e330d4fb387be0279abcb087bf0e23be2aed2 Mon Sep 17 00:00:00 2001
+From cee1e4c0473f12e2dc86ddefed433fb92443be5c Mon Sep 17 00:00:00 2001
From: Shane Freeder
Date: Sun, 18 Nov 2018 19:44:54 +0000
Subject: [PATCH] Make the default permission message configurable
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0c519c412..2148a3c26 100644
+index 0c519c41..2148a3c2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1557,6 +1557,15 @@ public final class Bukkit {
@@ -25,7 +25,7 @@ index 0c519c412..2148a3c26 100644
* Creates a PlayerProfile for the specified uuid, with name as null
* @param uuid UUID to create profile for
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8a76df524..1cbb9bc66 100644
+index 8a76df52..1cbb9bc6 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1364,6 +1364,13 @@ public interface Server extends PluginMessageRecipient {
@@ -43,7 +43,7 @@ index 8a76df524..1cbb9bc66 100644
* Creates a PlayerProfile for the specified uuid, with name as null
* @param uuid UUID to create profile for
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 03bdc1622..0b0d1bd7c 100644
+index 03bdc162..0b0d1bd7 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -185,7 +185,7 @@ public abstract class Command {
@@ -56,5 +56,5 @@ index 03bdc1622..0b0d1bd7c 100644
for (String line : permissionMessage.replace("", permission).split("\n")) {
target.sendMessage(line);
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
index dc65630fc3..1cbb020393 100644
--- a/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
@@ -1,4 +1,4 @@
-From 8d325190904286d345de34c047d051565ee3fb6b Mon Sep 17 00:00:00 2001
+From da96969afee7a4b6c69ae1020f4cb5992c95604e Mon Sep 17 00:00:00 2001
From: Shane Freeder
Date: Sun, 18 Nov 2018 15:53:43 +0000
Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit
@@ -21,7 +21,7 @@ this is going to be the best soultion all around.
Improvements/suggestions welcome!
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
-index 963b9ead4..a976c32de 100644
+index 963b9ead..a976c32d 100644
--- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
+++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
@@ -13,10 +13,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
@@ -64,7 +64,7 @@ index 963b9ead4..a976c32de 100644
@Override
public HandlerList getHandlers() {
diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-index a473b2c6e..a5b4aed52 100644
+index a473b2c6..a5b4aed5 100644
--- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
@@ -16,11 +16,20 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable
@@ -108,5 +108,5 @@ index a473b2c6e..a5b4aed52 100644
@Override
public HandlerList getHandlers()
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch
index 00d4218db1..8c11e75005 100644
--- a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch
+++ b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch
@@ -1,11 +1,11 @@
-From 5eebc3f74580df0dc9f9e85de16366fcd301303c Mon Sep 17 00:00:00 2001
+From 390a6e71ac79020d4819cbcab004af43f7689d02 Mon Sep 17 00:00:00 2001
From: BillyGalbreath
Date: Sun, 7 Oct 2018 04:29:51 -0500
Subject: [PATCH] Add more Zombie API
diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
-index 6dcac9798..fa7a43c35 100644
+index 6dcac979..fa7a43c3 100644
--- a/src/main/java/org/bukkit/entity/Zombie.java
+++ b/src/main/java/org/bukkit/entity/Zombie.java
@@ -86,4 +86,55 @@ public interface Zombie extends Monster {
@@ -65,5 +65,5 @@ index 6dcac9798..fa7a43c35 100644
+ // Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch b/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch
index 80d960eb35..8889f9a677 100644
--- a/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch
@@ -1,11 +1,11 @@
-From 48dfc4dd10a6ed04373569ef4514f2c7cfb346f5 Mon Sep 17 00:00:00 2001
+From d05cfe5510c7b9bf9a59b7b1b01b28e598818d32 Mon Sep 17 00:00:00 2001
From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
Date: Tue, 23 Oct 2018 19:32:55 +0300
Subject: [PATCH] Change the reserved channel check to be sensible
diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
-index 1d061412c..6fda7f3aa 100644
+index 1d061412..6fda7f3a 100644
--- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
+++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
@@ -172,7 +172,7 @@ public class StandardMessenger implements Messenger {
@@ -18,7 +18,7 @@ index 1d061412c..6fda7f3aa 100644
@Override
diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
-index dce3d619a..7e2335ed8 100644
+index dce3d619..7e2335ed 100644
--- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
+++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
@@ -25,8 +25,8 @@ public class StandardMessengerTest {
@@ -33,5 +33,5 @@ index dce3d619a..7e2335ed8 100644
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch
index a14f88ecf6..026efdddb1 100644
--- a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From 009d528d0165243b2a9e3fe673d2e4e63c423eb6 Mon Sep 17 00:00:00 2001
+From 95d30490448f23dea22036dc8cf2dcfe738143c2 Mon Sep 17 00:00:00 2001
From: Spottedleaf
Date: Sun, 7 Oct 2018 12:05:06 -0700
Subject: [PATCH] Add PlayerConnectionCloseEvent
@@ -35,7 +35,7 @@ is undefined.
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
new file mode 100644
-index 000000000..12c1c6fe9
+index 00000000..12c1c6fe
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
@@ -0,0 +1,95 @@
@@ -135,5 +135,5 @@ index 000000000..12c1c6fe9
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 203b37c418..b7a1fce663 100644
--- a/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From d365f8709924fca24da48483363f820370e6f518 Mon Sep 17 00:00:00 2001
+From e1c6a27f1e758a693838a8a716cb5c89035636fa Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Wed, 2 Jan 2019 00:31:12 -0600
Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
documented as to their purpose.
diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 222a9a7bf..3ab914fb2 100644
+index 222a9a7b..3ab914fb 100644
--- a/src/main/java/org/bukkit/OfflinePlayer.java
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
@@ -146,7 +146,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -61,5 +61,5 @@ index 222a9a7bf..3ab914fb2 100644
+
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0170-BlockDestroyEvent.patch b/Spigot-API-Patches/0170-BlockDestroyEvent.patch
index 68125f3f8e..389dd7daa9 100644
--- a/Spigot-API-Patches/0170-BlockDestroyEvent.patch
+++ b/Spigot-API-Patches/0170-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From 5ab789847092498cb922959f046373d0c2976d13 Mon Sep 17 00:00:00 2001
+From b092cecdb21d7d793b27bdea3cd4a09cb2881b3d Mon Sep 17 00:00:00 2001
From: Aikar
Date: Wed, 6 Feb 2019 00:19:33 -0500
Subject: [PATCH] BlockDestroyEvent
@@ -12,7 +12,7 @@ This can replace many uses of BlockPhysicsEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java
new file mode 100644
-index 000000000..3aee12f1c
+index 00000000..3aee12f1
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java
@@ -0,0 +1,92 @@
@@ -109,5 +109,5 @@ index 000000000..3aee12f1c
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch b/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch
index af7da792b4..98f9f33428 100644
--- a/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch
@@ -1,4 +1,4 @@
-From 79a77f853194bb36fa722b0eb5fcafa506e72c2a Mon Sep 17 00:00:00 2001
+From 920263b23cfbcb3a9a4d0a573361be12ac818318 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 28 Jan 2014 19:13:57 -0500
Subject: [PATCH] Add ItemStack Recipe API helper methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Add ItemStack Recipe API helper methods
Allows using ExactChoice Recipes with easier methodss
diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index d742c4058..222a12baa 100644
+index d742c405..222a12ba 100644
--- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
+++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
@@ -145,6 +145,13 @@ public class ShapedRecipe implements Recipe, Keyed {
@@ -24,7 +24,7 @@ index d742c4058..222a12baa 100644
* Get a copy of the ingredients map.
*
diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 84062dd71..ddcf84e66 100644
+index 84062dd7..ddcf84e6 100644
--- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
+++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
@@ -143,6 +143,40 @@ public class ShapelessRecipe implements Recipe, Keyed {
@@ -69,5 +69,5 @@ index 84062dd71..ddcf84e66 100644
* Removes an ingredient from the list.
*
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch
index a642d06e0c..dd11e48928 100644
--- a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch
+++ b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch
@@ -1,4 +1,4 @@
-From cb894dce36610bc0d2324b5d059ab0c6ceceddf1 Mon Sep 17 00:00:00 2001
+From aff15115615b56bf411d71d5bb34501c4bb48bcc Mon Sep 17 00:00:00 2001
From: Mark Vainomaa
Date: Wed, 13 Mar 2019 20:04:43 +0200
Subject: [PATCH] Add WhitelistToggleEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add WhitelistToggleEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java
new file mode 100644
-index 000000000..fdd5eedb2
+index 00000000..fdd5eedb
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java
@@ -0,0 +1,40 @@
@@ -51,5 +51,5 @@ index 000000000..fdd5eedb2
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0173-Annotation-Test-changes.patch b/Spigot-API-Patches/0173-Annotation-Test-changes.patch
index ddbfde4a6d..f64bd94796 100644
--- a/Spigot-API-Patches/0173-Annotation-Test-changes.patch
+++ b/Spigot-API-Patches/0173-Annotation-Test-changes.patch
@@ -1,11 +1,11 @@
-From 670b58d2d4e773378735e0e2b8cf388a4e941e80 Mon Sep 17 00:00:00 2001
+From 78ebc2fda46badc3e3b4a1e7145758fe80d43609 Mon Sep 17 00:00:00 2001
From: Shane Freeder
Date: Sun, 17 Mar 2019 23:04:30 +0000
Subject: [PATCH] Annotation Test changes
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index cc6b6e209..328a5a163 100644
+index 0c737724..38be576b 100644
--- a/src/test/java/org/bukkit/AnnotationTest.java
+++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -40,7 +40,17 @@ public class AnnotationTest {
@@ -28,5 +28,5 @@ index cc6b6e209..328a5a163 100644
@Test
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch
index a00e642539..8cce304017 100644
--- a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch
+++ b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From 438ca84fe0a7cabce8f510292ce8f288596aed51 Mon Sep 17 00:00:00 2001
+From 9ec32ef81405280984d6b00aecc95b492a2cc93e Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sun, 24 Mar 2019 00:21:23 -0400
Subject: [PATCH] Entity#getEntitySpawnReason
@@ -26,5 +26,5 @@ index 83e02aea..60dbfab0 100644
// Paper end
}
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0175-Add-GS4-Query-event.patch b/Spigot-API-Patches/0175-Add-GS4-Query-event.patch
index a520e6093e..7110814403 100644
--- a/Spigot-API-Patches/0175-Add-GS4-Query-event.patch
+++ b/Spigot-API-Patches/0175-Add-GS4-Query-event.patch
@@ -1,4 +1,4 @@
-From 332d4b565f7bce47709cd2c6740068b20c338ef0 Mon Sep 17 00:00:00 2001
+From bf1cc0ed093a3faacca2e7f701fb6f0fa5396635 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa
Date: Sun, 17 Mar 2019 21:46:27 +0200
Subject: [PATCH] Add GS4 Query event
@@ -6,7 +6,7 @@ Subject: [PATCH] Add GS4 Query event
diff --git a/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java
new file mode 100644
-index 000000000..77a19995f
+index 00000000..77a19995
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java
@@ -0,0 +1,412 @@
@@ -423,5 +423,5 @@ index 000000000..77a19995f
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch
index 8e19c47e7d..56c172a582 100644
--- a/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch
+++ b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch
@@ -1,4 +1,4 @@
-From bdee9be039bcf8a139395c9cf049f71ab881a9a0 Mon Sep 17 00:00:00 2001
+From 7a592cec03927827fbf2ab5025335b3750aeecb6 Mon Sep 17 00:00:00 2001
From: MisterVector
Date: Fri, 26 Oct 2018 21:33:13 -0700
Subject: [PATCH] Add PlayerPostRespawnEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerPostRespawnEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java
new file mode 100644
-index 000000000..31f34b548
+index 00000000..31f34b54
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java
@@ -0,0 +1,52 @@
@@ -63,5 +63,5 @@ index 000000000..31f34b548
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch b/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch
index c126ebed53..d992419057 100644
--- a/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch
+++ b/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch
@@ -1,4 +1,4 @@
-From 4cafba0863a49a01e17c6e6e284cf4a3f2ab031a Mon Sep 17 00:00:00 2001
+From ac8062829a86c489fdd2cc70debe62b179b1034c Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sun, 24 Mar 2019 18:44:26 -0400
Subject: [PATCH] Ignore package-private methods for nullability annotations
@@ -6,7 +6,7 @@ Subject: [PATCH] Ignore package-private methods for nullability annotations
This isn't API
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 328a5a163..af2abd47f 100644
+index 38be576b..a48be38b 100644
--- a/src/test/java/org/bukkit/AnnotationTest.java
+++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -162,7 +162,7 @@ public class AnnotationTest {
@@ -19,5 +19,5 @@ index 328a5a163..af2abd47f 100644
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch b/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch
index fe052ea536..1b656af5a2 100644
--- a/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch
+++ b/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch
@@ -1,4 +1,4 @@
-From d6296efc1c050316fb10c82a548799879957e508 Mon Sep 17 00:00:00 2001
+From 82d88fc0c93750b65215391f6570a68680cccca8 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sun, 24 Mar 2019 18:39:01 -0400
Subject: [PATCH] Flip some Spigot API null annotations
@@ -9,7 +9,7 @@ a ton of noise to plugin developers.
These do not help plugin developers if they bring moise noise than value.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2148a3c26..6db691591 100644
+index 2148a3c2..6db69159 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1153,7 +1153,7 @@ public final class Bukkit {
@@ -31,7 +31,7 @@ index 2148a3c26..6db691591 100644
return server.getTag(registry, tag, clazz);
}
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 4e69f277b..2a40da99f 100644
+index 6e1a1124..77d9cd0a 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -62,7 +62,7 @@ index 4e69f277b..2a40da99f 100644
if (this.world == null) {
return null;
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1cbb9bc66..27d3b5ad7 100644
+index 1cbb9bc6..27d3b5ad 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -962,7 +962,7 @@ public interface Server extends PluginMessageRecipient {
@@ -84,7 +84,7 @@ index 1cbb9bc66..27d3b5ad7 100644
/**
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 3cada3487..03ba22659 100644
+index 3cada348..03ba2265 100644
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
@@ -3,6 +3,7 @@ package org.bukkit.inventory;
@@ -105,7 +105,7 @@ index 3cada3487..03ba22659 100644
/**
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 6d18de762..495161f62 100644
+index dfe52817..19e0852c 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -8,6 +8,7 @@ import java.util.Set; // Paper
@@ -116,7 +116,7 @@ index 6d18de762..495161f62 100644
import org.bukkit.Utility;
import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.bukkit.enchantments.Enchantment;
-@@ -528,7 +529,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -544,7 +545,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
*
* @return a copy of the current ItemStack's ItemData
*/
@@ -126,5 +126,5 @@ index 6d18de762..495161f62 100644
return this.meta == null ? Bukkit.getItemFactory().getItemMeta(this.type) : this.meta.clone();
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0179-Server-Tick-Events.patch b/Spigot-API-Patches/0179-Server-Tick-Events.patch
index cad6ccbf64..e1d83d3786 100644
--- a/Spigot-API-Patches/0179-Server-Tick-Events.patch
+++ b/Spigot-API-Patches/0179-Server-Tick-Events.patch
@@ -1,4 +1,4 @@
-From 4b52e53d9edd013e687d915bd4e605ba4192760a Mon Sep 17 00:00:00 2001
+From 9ead8f3285ae8c2f39563a8189bada2f38876e48 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Wed, 27 Mar 2019 21:58:55 -0400
Subject: [PATCH] Server Tick Events
@@ -7,7 +7,7 @@ Fires event at start and end of a server tick
diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java
new file mode 100644
-index 000000000..9fd28e036
+index 00000000..9fd28e03
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java
@@ -0,0 +1,59 @@
@@ -72,7 +72,7 @@ index 000000000..9fd28e036
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java
new file mode 100644
-index 000000000..eac85f1f4
+index 00000000..eac85f1f
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java
@@ -0,0 +1,32 @@
@@ -109,5 +109,5 @@ index 000000000..eac85f1f4
+ }
+}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch
index 2c2892ac0c..c2fa517030 100644
--- a/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,4 +1,4 @@
-From 9237e815abdc669507ac2c602da9f1daec551a4c Mon Sep 17 00:00:00 2001
+From 90ee83866858a8d71451b57c18653ce6d56ec2a4 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Mon, 11 Mar 2013 20:04:34 -0400
Subject: [PATCH] PlayerDeathEvent#getItemsToKeep
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
-index f0dda632d..f5c3c5e24 100644
+index 07a52441..1e97d04b 100644
--- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
+++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
@@ -17,6 +17,40 @@ public class PlayerDeathEvent extends EntityDeathEvent {
@@ -53,5 +53,5 @@ index f0dda632d..f5c3c5e24 100644
this(player, drops, droppedExp, 0, deathMessage);
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0181-Add-Heightmap-API.patch b/Spigot-API-Patches/0181-Add-Heightmap-API.patch
index 0904ac66f2..5d42179a6b 100644
--- a/Spigot-API-Patches/0181-Add-Heightmap-API.patch
+++ b/Spigot-API-Patches/0181-Add-Heightmap-API.patch
@@ -1,4 +1,4 @@
-From 8f07bbb425c028ff4d52daf6f08197239c8436e1 Mon Sep 17 00:00:00 2001
+From 0de142a12fee06c6dd294d94bbb6351bb727c4f4 Mon Sep 17 00:00:00 2001
From: Spottedleaf
Date: Sat, 1 Dec 2018 19:00:36 -0800
Subject: [PATCH] Add Heightmap API
@@ -46,7 +46,7 @@ index 00000000..4cd9b5ed
+ SOLID_OR_LIQUID_NO_LEAVES;
+}
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 2a40da99..3e1ca4c9 100644
+index 77d9cd0a..59047503 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -638,6 +638,33 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -84,10 +84,10 @@ index 2a40da99..3e1ca4c9 100644
* Creates explosion at this location with given power
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b02cda3e..1e7b633c 100644
+index 23c76976..b46b2719 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -162,6 +162,79 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -159,6 +159,79 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Block getHighestBlockAt(@NotNull Location location);
@@ -168,5 +168,5 @@ index b02cda3e..1e7b633c 100644
* Gets the {@link Chunk} at the given coordinates
*
--
-2.22.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch b/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch
index 4f2b1af5eb..ea72c15318 100644
--- a/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch
@@ -1,4 +1,4 @@
-From a648fedca90dbada98f8227d22e0c79faa83e2ca Mon Sep 17 00:00:00 2001
+From d5a5de22dce06c0d7a62b347c1af562ae7d454aa Mon Sep 17 00:00:00 2001
From: William Blake Galbreath
Date: Fri, 19 Apr 2019 12:41:19 -0500
Subject: [PATCH] Mob Spawner API Enhancements
@@ -28,5 +28,5 @@ index cb447a4a..35a599eb 100644
+ // Paper end
}
--
-2.24.1
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch
index 7dcafd030c..3ae3d6db94 100644
--- a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch
+++ b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch
@@ -1,4 +1,4 @@
-From 4e67614c99511b658d31cff8f3ec26f076e48c95 Mon Sep 17 00:00:00 2001
+From 236a9fac537404b947a85a76ded73bbd9031a915 Mon Sep 17 00:00:00 2001
From: simpleauthority
Date: Tue, 28 May 2019 03:41:28 -0700
Subject: [PATCH] Add BlockSoundGroup interface
@@ -7,7 +7,7 @@ This PR adds the getSoundGroup() method in Block which returns a BlockSoundGroup
diff --git a/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
new file mode 100644
-index 000000000..8cf87d228
+index 00000000..8cf87d22
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
@@ -0,0 +1,52 @@
@@ -64,7 +64,7 @@ index 000000000..8cf87d228
+ Sound getFallSound();
+}
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 87185a812..038de5a64 100644
+index 87185a81..038de5a6 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -1,6 +1,7 @@
@@ -93,5 +93,5 @@ index 87185a812..038de5a64 100644
+ // Paper end
}
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
index 544630229b..f1e891a720 100644
--- a/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
+++ b/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
@@ -1,4 +1,4 @@
-From c02f688da65316acf628b036b704966fa9bf8dfe Mon Sep 17 00:00:00 2001
+From 54ca16e5e62b0dc6b5b8ba1c3eec75cba8faabd5 Mon Sep 17 00:00:00 2001
From: simpleauthority
Date: Thu, 11 Jul 2019 10:35:56 -0700
Subject: [PATCH] Amend PlayerInteractAtEntityEvent javadoc for ArmorStands
@@ -19,5 +19,5 @@ index 1075dbb8..3f24d302 100644
public class PlayerInteractAtEntityEvent extends PlayerInteractEntityEvent {
private static final HandlerList handlers = new HandlerList();
--
-2.19.2
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch b/Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch
index c466b0928c..3b2eb11537 100644
--- a/Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch
+++ b/Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch
@@ -1,4 +1,4 @@
-From f0f2d08f8c81182aab2dc14dc62f513de55f3689 Mon Sep 17 00:00:00 2001
+From 93548ddd969d1473484e7793511d8019c7d430ec Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Wed, 2 Oct 2019 21:24:28 -0500
Subject: [PATCH] Name the specific custom world gen plugin class that throws a
@@ -22,5 +22,5 @@ index 5b847bb3..6c9d313f 100644
/**
--
-2.24.1
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch b/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch
index e556e86376..1a6aba2f9a 100644
--- a/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch
+++ b/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch
@@ -1,4 +1,4 @@
-From fe4413704ee328c31901a2083a7d812d02bef2e0 Mon Sep 17 00:00:00 2001
+From cbc7f9e4c9ec7b585261a98c14939270f394f8f3 Mon Sep 17 00:00:00 2001
From: Shane Freeder
Date: Fri, 18 Oct 2019 17:39:05 +0100
Subject: [PATCH] Increase custom payload channel message size
@@ -20,5 +20,5 @@ index ea9b525f..682c7718 100644
/**
* Checks if the specified channel is a reserved name.
--
-2.23.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch b/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch
index 727d4ba15c..03d3adf888 100644
--- a/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch
+++ b/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch
@@ -1,4 +1,4 @@
-From 078c70f326b5c98a45611ee06bdb1b4d767a4f5f Mon Sep 17 00:00:00 2001
+From c50ead5ff128e961fe1f3b8e823a0f3a2036f08b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath
Date: Sat, 20 Apr 2019 19:47:29 -0500
Subject: [PATCH] Expose the internal current tick
@@ -37,5 +37,5 @@ index 27d3b5ad..31470479 100644
// Paper end
}
--
-2.23.0
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch
index 60a2666719..03797fb44c 100644
--- a/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch
+++ b/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch
@@ -1,4 +1,4 @@
-From 26f8dfff57e31852d46c49274e1a45d9d66c6523 Mon Sep 17 00:00:00 2001
+From aebd26ded7622ed404a7ee216378447a6e16a106 Mon Sep 17 00:00:00 2001
From: Shane Freeder
Date: Tue, 24 Dec 2019 00:35:31 +0000
Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
@@ -60,5 +60,5 @@ index 1e97d04b..3a743430 100644
@NotNull
--
-2.24.1
+2.25.0.windows.1
diff --git a/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch b/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch
index 29a78767da..6f1641b0f2 100644
--- a/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch
+++ b/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch
@@ -1,4 +1,4 @@
-From 26ab8a84de63cd94f51c9edbe7f9f4070b4e4dbe Mon Sep 17 00:00:00 2001
+From dde41eab315a4b6cce19b82218b31a5fb5a069ee Mon Sep 17 00:00:00 2001
From: William Blake Galbreath
Date: Thu, 2 Jan 2020 12:25:16 -0600
Subject: [PATCH] Add effect to block break naturally
@@ -28,5 +28,5 @@ index 038de5a6..a14a7583 100644
* Returns a list of items which would drop by destroying this block
*
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index 4b2060b265..5a2a16bf66 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From 92d645237db7b0287e09f0610f95643d701fad80 Mon Sep 17 00:00:00 2001
+From f4eb8e7892445a413b8c70f54fd16397a8aa402e Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Mon, 29 Feb 2016 20:40:33 -0600
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
-index b1a12eca1..22e4ce22a 100644
+index 522b89751..ee7d3d521 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,15 +1,14 @@
@@ -16,7 +16,7 @@ index b1a12eca1..22e4ce22a 100644
- spigot
+ paper
jar
- 1.15.1-R0.1-SNAPSHOT
+ 1.15.2-R0.1-SNAPSHOT
- Spigot
- https://www.spigotmc.org/
+ Paper
@@ -27,7 +27,7 @@ index b1a12eca1..22e4ce22a 100644
+
UTF-8
unknown
- 1.15.1
+ 1.15.2
@@ -22,16 +21,16 @@
@@ -159,5 +159,5 @@ index 93046379d..674096cab 100644
if (stream != null) {
--
-2.24.1
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
index 2dffdd5eb3..fb2aff9939 100644
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -1,4 +1,4 @@
-From fad26d57c0fefc74ad043ec41828108d93bfe7bb Mon Sep 17 00:00:00 2001
+From acebed7739beb3bd86a6a94278fca6a8ad6401bc Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Mon, 29 Feb 2016 21:02:09 -0600
Subject: [PATCH] Paper config files
@@ -521,10 +521,10 @@ index 000000000..a73865739
+ }
+}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index e3a830064..20ed423fa 100644
+index ba24b738d..1cde6fc9c 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -162,6 +162,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -163,6 +163,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
org.spigotmc.SpigotConfig.init((File) options.valueOf("spigot-settings"));
org.spigotmc.SpigotConfig.registerCommands();
// Spigot end
@@ -541,7 +541,7 @@ index e3a830064..20ed423fa 100644
this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals);
this.setSpawnNPCs(dedicatedserverproperties.spawnNpcs);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5c495688e..da19b682a 100644
+index 4c802459d..c07284d35 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -135,9 +135,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -558,7 +558,7 @@ index 5c495688e..da19b682a 100644
public long aa;
public long ab;
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index c1e050426..cf9612d17 100644
+index ddca89a13..f937b7294 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -581,7 +581,7 @@ index c1e050426..cf9612d17 100644
+ // Paper end
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5edbdebf3..602a395b3 100644
+index a1ee67b30..692f8e4b7 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -85,6 +85,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -602,7 +602,7 @@ index 5edbdebf3..602a395b3 100644
this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 465af5fb6..a72238a9d 100644
+index 4243460e4..57ad50403 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -757,6 +757,7 @@ public final class CraftServer implements Server {
@@ -666,10 +666,10 @@ index 465af5fb6..a72238a9d 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 6c2373569..a668bc4e8 100644
+index 766e0f6b1..3a0c01852 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -128,6 +128,14 @@ public class Main {
+@@ -129,6 +129,14 @@ public class Main {
.defaultsTo(new File("spigot.yml"))
.describedAs("Yml file");
// Spigot End
@@ -685,7 +685,7 @@ index 6c2373569..a668bc4e8 100644
};
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 6ae3b3185..8c7dd0133 100644
+index 34964d285..5686a4f1a 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -39,36 +39,36 @@ public class SpigotWorldConfig
@@ -732,5 +732,5 @@ index 6ae3b3185..8c7dd0133 100644
config.addDefault( "world-settings.default." + path, def );
return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
index 288e009f61..aede2fdc7d 100644
--- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
+++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
@@ -1,4 +1,4 @@
-From 989cb57bde61072538221078488e241958fdbdbc Mon Sep 17 00:00:00 2001
+From b094d235e668b63afb13e4d01a9b14c45fa4363f Mon Sep 17 00:00:00 2001
From: Aikar
Date: Wed, 30 Mar 2016 19:36:20 -0400
Subject: [PATCH] MC Dev fixes
@@ -170,7 +170,7 @@ index 7d44348c7..73ecdd22e 100644
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true));
diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
-index 1f3ea23ae..b098d86e3 100644
+index 447f6a55b..1890c760f 100644
--- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
+++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
@@ -55,7 +55,7 @@ public abstract class IAsyncTaskHandler implements Mailbox stream = this.getEntities(entity, axisalignedbb1).stream().filter((entity1) -> { // Paper - decompile fix
return !set.contains(entity1);
}).filter((entity1) -> {
- return entity == null || !entity.x(entity1);
+ return entity == null || !entity.isSameVehicle(entity1);
@@ -55,7 +55,6 @@ public interface IEntityAccess {
return Stream.of(entity1.au(), entity == null ? null : entity.j(entity1));
}).filter(Objects::nonNull);
@@ -634,5 +634,5 @@ index 55fe7625a..19e68a783 100644
t0.a(nbttagcompound.getCompound("data"));
--
-2.24.1
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch
index de5935e6f1..0be36afc1b 100644
--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0004-MC-Utils.patch
@@ -1,4 +1,4 @@
-From a0b808cc25884976a9235109a107fa6f2e6916a2 Mon Sep 17 00:00:00 2001
+From 23bf7ede3aac2e0054dcdc6301da047f0918a09b Mon Sep 17 00:00:00 2001
From: Aikar
Date: Mon, 28 Mar 2016 20:55:47 -0400
Subject: [PATCH] MC Utils
@@ -166,7 +166,7 @@ index 260644bf0..f2a19acd8 100644
}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 2e8a087bd..c5121d369 100644
+index e8b7cc06c..9cd21b1ff 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -77,6 +77,37 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -304,7 +304,7 @@ index e1398652a..7ee5eb987 100644
// CraftBukkit start - fire event
setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0f6fd2d70..138bc38e6 100644
+index 3b1bcf349..1f350e335 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -129,6 +129,7 @@ public abstract class EntityLiving extends Entity {
@@ -328,7 +328,7 @@ index 00c3b666d..e5322fbae 100644
super(entitytypes, world);
this.f = 5;
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index cf9612d17..755d34e61 100644
+index f937b7294..cbf0c2f25 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -4,6 +4,7 @@ import com.mojang.datafixers.DataFixUtils;
@@ -351,7 +351,7 @@ index cf9612d17..755d34e61 100644
}
diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
-index b098d86e3..721021791 100644
+index 1890c760f..7e5ece9d5 100644
--- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
+++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
@@ -68,6 +68,15 @@ public abstract class IAsyncTaskHandler implements Mailbox
Date: Fri, 24 Mar 2017 23:56:01 -0500
Subject: [PATCH] Paper Metrics
@@ -15,7 +15,7 @@ decisions on behalf of the project.
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
new file mode 100644
-index 0000000000..e257d6b36e
+index 000000000..e257d6b36
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -0,0 +1,627 @@
@@ -647,7 +647,7 @@ index 0000000000..e257d6b36e
+ }
+}
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index db79fe41b9..5518ec1e54 100644
+index 273cdb598..b6d470e59 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -41,6 +41,7 @@ public class PaperConfig {
@@ -671,7 +671,7 @@ index db79fe41b9..5518ec1e54 100644
static void readConfig(Class clazz, Object instance) {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index a7a47b1f32..fc6cb9306a 100644
+index ff1ddfcfe..fdca34346 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -83,6 +83,7 @@ public class SpigotConfig
@@ -691,5 +691,5 @@ index a7a47b1f32..fc6cb9306a 100644
static void readConfig(Class clazz, Object instance)
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
index 79656b5ae6..fbdb3abca0 100644
--- a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
+++ b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
@@ -1,4 +1,4 @@
-From 6cb23c0849c8579aecb73ffe391df83526bd6281 Mon Sep 17 00:00:00 2001
+From 7d359c397e600267fe7d4f10e7c35e6bc7523fd5 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Wed, 4 Jul 2018 01:40:13 -0400
Subject: [PATCH] Add MinecraftKey Information to Objects
@@ -19,7 +19,7 @@ index db899937b..eecf27370 100644
MutablePair> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index da19b682a..a203f5d14 100644
+index c07284d35..a8ea70b36 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -49,7 +49,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -65,7 +65,7 @@ index da19b682a..a203f5d14 100644
protected abstract void a(NBTTagCompound nbttagcompound);
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 755d34e61..d49ad0308 100644
+index cbf0c2f25..79f854966 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -237,6 +237,7 @@ public class EntityTypes {
@@ -141,5 +141,5 @@ index 40752f761..9071bb7ec 100644
public World getWorld() {
return this.world;
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
index 01a0c753c4..0382f98162 100644
--- a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
+++ b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
@@ -1,4 +1,4 @@
-From 90f7a4116fa55f0b41e47a9702a7eaad2cc67d4d Mon Sep 17 00:00:00 2001
+From 7f6a88f275bf307644ba5a8a0507c1eee3507d37 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Wed, 4 Jul 2018 02:10:36 -0400
Subject: [PATCH] Store reference to current Chunk for Entity and Block
@@ -90,7 +90,7 @@ index cfffbd031..125d3acdc 100644
@Override
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a203f5d14..2a5e8d34e 100644
+index a8ea70b36..3a969d92e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -134,7 +134,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -188,5 +188,5 @@ index 63ecbcd47..c82c21326 100644
/**
* Order is *EXTREMELY* important -- keep it right! =D
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch b/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch
index 28dc892de4..6875319186 100644
--- a/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch
+++ b/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch
@@ -1,4 +1,4 @@
-From a5904cd023908ab09a645472a4d04300ae07550a Mon Sep 17 00:00:00 2001
+From 50eee3a1fb88960217779354b20dd20daae7c7b6 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Wed, 4 Jul 2018 02:13:59 -0400
Subject: [PATCH] Store counts for each Entity/Block Entity Type
@@ -54,5 +54,5 @@ index 125d3acdc..dcaf3a509 100644
}
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 98226f383e..6b92a5ac56 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 1a80bae7a79972b8da9e0371a218b0b1a93517fa Mon Sep 17 00:00:00 2001
+From 52f1636755ebeb48bcb0cd8d32f529e63ca13313 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2
@@ -375,13 +375,13 @@ index dcaf3a509..5f9031257 100644
}
}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index c5121d369..459baf26d 100644
+index 9cd21b1ff..99afce39a 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -129,11 +129,13 @@ public class ChunkProviderServer extends IChunkProvider {
- }
+@@ -133,11 +133,13 @@ public class ChunkProviderServer extends IChunkProvider {
}
+ gameprofilerfiller.c("getChunkCacheMiss");
- world.timings.syncChunkLoadTimer.startTiming(); // Spigot
CompletableFuture> completablefuture = this.getChunkFutureMainThread(i, j, chunkstatus, flag);
@@ -394,7 +394,7 @@ index c5121d369..459baf26d 100644
ichunkaccess = (IChunkAccess) ((Either) completablefuture.join()).map((ichunkaccess1) -> {
return ichunkaccess1;
}, (playerchunk_failure) -> {
-@@ -325,7 +327,9 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -330,7 +332,9 @@ public class ChunkProviderServer extends IChunkProvider {
public void save(boolean flag) {
this.tickDistanceManager();
@@ -404,7 +404,7 @@ index c5121d369..459baf26d 100644
}
@Override
-@@ -362,7 +366,9 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -367,7 +371,9 @@ public class ChunkProviderServer extends IChunkProvider {
this.tickDistanceManager();
this.world.timings.doChunkMap.stopTiming(); // Spigot
this.world.getMethodProfiler().exitEnter("chunks");
@@ -414,7 +414,7 @@ index c5121d369..459baf26d 100644
this.world.timings.doChunkUnload.startTiming(); // Spigot
this.world.getMethodProfiler().exitEnter("unload");
this.playerChunkMap.unloadChunks(booleansupplier);
-@@ -387,10 +393,12 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -392,10 +398,12 @@ public class ChunkProviderServer extends IChunkProvider {
boolean flag2 = world.ticksPerAnimalSpawns != 0L && worlddata.getTime() % world.ticksPerAnimalSpawns == 0L; // CraftBukkit // PAIL: TODO monster ticks
this.world.getMethodProfiler().enter("naturalSpawnCount");
@@ -427,7 +427,7 @@ index c5121d369..459baf26d 100644
this.world.getMethodProfiler().exit();
this.playerChunkMap.f().forEach((playerchunk) -> {
Optional optional = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left();
-@@ -399,13 +407,27 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -404,13 +412,27 @@ public class ChunkProviderServer extends IChunkProvider {
Chunk chunk = (Chunk) optional.get();
this.world.getMethodProfiler().enter("broadcast");
@@ -457,7 +457,7 @@ index c5121d369..459baf26d 100644
this.world.getMethodProfiler().enter("spawner");
this.world.timings.mobSpawn.startTiming(); // Spigot
EnumCreatureType[] aenumcreaturetype1 = aenumcreaturetype;
-@@ -449,24 +471,24 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -454,24 +476,24 @@ public class ChunkProviderServer extends IChunkProvider {
this.world.getMethodProfiler().exit();
}
@@ -525,7 +525,7 @@ index e16d30f2c..4af5a230b 100644
}
diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
-index c3218fbc3..94195a7f9 100644
+index 8d7a6d240..707bd2600 100644
--- a/src/main/java/net/minecraft/server/CustomFunction.java
+++ b/src/main/java/net/minecraft/server/CustomFunction.java
@@ -13,12 +13,22 @@ public class CustomFunction {
@@ -552,32 +552,32 @@ index c3218fbc3..94195a7f9 100644
return this.b;
}
diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
-index 334de8b04..872a6cbbb 100644
+index ba40d5fbb..ee42e1dfa 100644
--- a/src/main/java/net/minecraft/server/CustomFunctionData.java
+++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
-@@ -101,7 +101,7 @@ public class CustomFunctionData implements IResourcePackListener {
-
- return 0;
+@@ -103,7 +103,7 @@ public class CustomFunctionData implements IResourcePackListener {
} else {
+ int j;
+
- try {
+ try (co.aikar.timings.Timing timing = customfunction.getTiming().startTiming()) { // Paper
this.h = true;
- int j = 0;
+ int k = 0;
CustomFunction.c[] acustomfunction_c = customfunction.b();
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 20ed423fa..141673d00 100644
+index 1cde6fc9c..e636433b1 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -19,6 +19,8 @@ import java.util.Collections;
- import java.util.List;
+@@ -20,6 +20,8 @@ import java.util.List;
import java.util.Locale;
+ import java.util.Optional;
import java.util.Random;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
import java.util.function.BooleanSupplier;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
-@@ -31,7 +33,7 @@ import org.apache.logging.log4j.Level;
+@@ -32,7 +34,7 @@ import org.apache.logging.log4j.Level;
import org.bukkit.command.CommandSender;
import org.bukkit.craftbukkit.LoggerOutputStream;
@@ -586,7 +586,7 @@ index 20ed423fa..141673d00 100644
import org.bukkit.event.server.ServerCommandEvent;
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.event.server.RemoteServerCommandEvent;
-@@ -425,7 +427,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -431,7 +433,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
public void handleCommandQueue() {
@@ -595,7 +595,7 @@ index 20ed423fa..141673d00 100644
while (!this.serverCommandQueue.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
-@@ -440,7 +442,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -446,7 +448,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
// CraftBukkit end
}
@@ -604,7 +604,7 @@ index 20ed423fa..141673d00 100644
}
@Override
-@@ -666,6 +668,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -672,6 +674,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@Override
public String executeRemoteCommand(String s) {
@@ -612,7 +612,7 @@ index 20ed423fa..141673d00 100644
this.remoteControlCommandListener.clearMessages();
this.executeSync(() -> {
// CraftBukkit start - fire RemoteServerCommandEvent
-@@ -674,10 +677,39 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -680,10 +683,39 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
if (event.isCancelled()) {
return;
}
@@ -653,7 +653,7 @@ index 20ed423fa..141673d00 100644
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a7e471066..5ae12e266 100644
+index 3a969d92e..2d8c37d73 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
@@ -692,7 +692,7 @@ index a7e471066..5ae12e266 100644
protected BlockPosition ag() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 138bc38e6..906ca1bfa 100644
+index 1f350e335..35e3f1c78 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -37,7 +37,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -704,7 +704,7 @@ index 138bc38e6..906ca1bfa 100644
public abstract class EntityLiving extends Entity {
-@@ -2260,7 +2260,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2262,7 +2262,6 @@ public abstract class EntityLiving extends Entity {
@Override
public void tick() {
@@ -712,7 +712,7 @@ index 138bc38e6..906ca1bfa 100644
super.tick();
this.o();
this.r();
-@@ -2348,9 +2347,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2350,9 +2349,7 @@ public abstract class EntityLiving extends Entity {
}
}
@@ -722,7 +722,7 @@ index 138bc38e6..906ca1bfa 100644
double d0 = this.locX() - this.lastX;
double d1 = this.locZ() - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
-@@ -2430,8 +2427,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2432,8 +2429,6 @@ public abstract class EntityLiving extends Entity {
if (this.isSleeping()) {
this.pitch = 0.0F;
}
@@ -731,7 +731,7 @@ index 138bc38e6..906ca1bfa 100644
}
protected float f(float f, float f1) {
-@@ -2510,7 +2505,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2512,7 +2507,6 @@ public abstract class EntityLiving extends Entity {
this.setMot(d4, d5, d6);
this.world.getMethodProfiler().enter("ai");
@@ -739,7 +739,7 @@ index 138bc38e6..906ca1bfa 100644
if (this.isFrozen()) {
this.jumping = false;
this.aZ = 0.0F;
-@@ -2520,7 +2514,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2522,7 +2516,6 @@ public abstract class EntityLiving extends Entity {
this.doTick();
this.world.getMethodProfiler().exit();
}
@@ -747,7 +747,7 @@ index 138bc38e6..906ca1bfa 100644
this.world.getMethodProfiler().exit();
this.world.getMethodProfiler().enter("jump");
-@@ -2544,9 +2537,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2546,9 +2539,7 @@ public abstract class EntityLiving extends Entity {
this.n();
AxisAlignedBB axisalignedbb = this.getBoundingBox();
@@ -757,7 +757,7 @@ index 138bc38e6..906ca1bfa 100644
this.world.getMethodProfiler().exit();
this.world.getMethodProfiler().enter("push");
if (this.bn > 0) {
-@@ -2554,9 +2545,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2556,9 +2547,7 @@ public abstract class EntityLiving extends Entity {
this.a(axisalignedbb, this.getBoundingBox());
}
@@ -768,7 +768,7 @@ index 138bc38e6..906ca1bfa 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a389fb5df..49c0764f1 100644
+index b4a0bd795..4dc691775 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -63,7 +63,7 @@ import org.bukkit.craftbukkit.CraftServer;
@@ -791,7 +791,7 @@ index a389fb5df..49c0764f1 100644
private final IReloadableResourceManager ae;
private final ResourcePackRepository resourcePackRepository;
@Nullable
-@@ -693,6 +693,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
@@ -859,7 +859,7 @@ index a389fb5df..49c0764f1 100644
}
this.methodProfiler.enter("snooper");
-@@ -1021,30 +1037,34 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant> f(ChunkCoordIntPair chunkcoordintpair) {
return CompletableFuture.supplyAsync(() -> {
- try {
-- NBTTagCompound nbttagcompound = this.readChunkData(chunkcoordintpair);
+ try (Timing ignored = this.world.timings.syncChunkLoadTimer.startTimingIfSync()) { // Paper
+ this.world.getMethodProfiler().c("chunkLoad");
+- NBTTagCompound nbttagcompound = this.readChunkData(chunkcoordintpair);
+ NBTTagCompound nbttagcompound; // Paper
-+ try (Timing ignored2 = this.world.timings.chunkIOStage1.startTimingIfSync()) { // Paper
-+ nbttagcompound = this.readChunkData(chunkcoordintpair);
-+ }
++ try (Timing ignored2 = this.world.timings.chunkIOStage1.startTimingIfSync()) { // Paper start - timings
++ nbttagcompound = this.readChunkData(chunkcoordintpair);
++ } // Paper end
if (nbttagcompound != null) {
boolean flag = nbttagcompound.hasKeyOfType("Level", 10) && nbttagcompound.getCompound("Level").hasKeyOfType("Status", 8);
-@@ -515,7 +520,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -519,7 +524,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+ return "chunkGenerate " + chunkstatus.d();
});
-
return completablefuture.thenComposeAsync((either) -> {
- return (CompletableFuture) either.map((list) -> {
+ return either.map((list) -> { // Paper - Shut up.
try {
CompletableFuture> completablefuture1 = chunkstatus.a(this.world, this.chunkGenerator, this.definedStructureManager, this.lightEngine, (ichunkaccess) -> {
return this.c(playerchunk);
-@@ -568,6 +573,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -572,6 +577,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
ChunkStatus chunkstatus = PlayerChunk.getChunkStatus(playerchunk.getTicketLevel());
return !chunkstatus.b(ChunkStatus.FULL) ? PlayerChunk.UNLOADED_CHUNK_ACCESS : either.mapLeft((ichunkaccess) -> {
@@ -988,7 +989,7 @@ index a4b246dc4..cd1579750 100644
ChunkCoordIntPair chunkcoordintpair = playerchunk.i();
Chunk chunk;
-@@ -619,6 +625,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -623,6 +629,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
return chunk;
@@ -996,7 +997,7 @@ index a4b246dc4..cd1579750 100644
});
}, (runnable) -> {
Mailbox mailbox = this.mailboxMain;
-@@ -1055,6 +1062,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1060,6 +1067,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
PlayerChunkMap.EntityTracker playerchunkmap_entitytracker;
ObjectIterator objectiterator;
@@ -1004,7 +1005,7 @@ index a4b246dc4..cd1579750 100644
for (objectiterator = this.trackedEntities.values().iterator(); objectiterator.hasNext(); playerchunkmap_entitytracker.trackerEntry.a()) {
playerchunkmap_entitytracker = (PlayerChunkMap.EntityTracker) objectiterator.next();
-@@ -1072,16 +1080,20 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1077,16 +1085,20 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
playerchunkmap_entitytracker.e = sectionposition1;
}
}
@@ -1201,7 +1202,7 @@ index 820180ab3..fa6400dcc 100644
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
public CraftPersistentDataContainer persistentDataContainer;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9f0fce400..f1860809c 100644
+index 8fc88f162..0087bd9b1 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1,5 +1,7 @@
@@ -1256,7 +1257,7 @@ index 9f0fce400..f1860809c 100644
CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked");
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c9646ebf7..924dd5e7f 100644
+index 32f8f2aed..bc1ff7d56 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1,6 +1,8 @@
@@ -1361,7 +1362,7 @@ index c9646ebf7..924dd5e7f 100644
gameprofilerfiller.exit();
}
-@@ -789,6 +799,7 @@ public class WorldServer extends World {
+@@ -799,6 +809,7 @@ public class WorldServer extends World {
if (!flag1) {
org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
@@ -1369,7 +1370,7 @@ index c9646ebf7..924dd5e7f 100644
if (iprogressupdate != null) {
iprogressupdate.a(new ChatMessage("menu.savingLevel", new Object[0]));
}
-@@ -798,7 +809,10 @@ public class WorldServer extends World {
+@@ -808,7 +819,10 @@ public class WorldServer extends World {
iprogressupdate.c(new ChatMessage("menu.savingChunks", new Object[0]));
}
@@ -1767,7 +1768,7 @@ index e52ef47b7..3d90b3426 100644
this.value = value;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index adad3a0fa..7d22aaffb 100644
+index 1860fbb1b..50a69e4cb 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -288,6 +288,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -1846,5 +1847,5 @@ index ca7789b5e..442383969 100644
}
}
--
-2.25.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch
index 41ef20d846..8bd5471113 100644
--- a/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch
+++ b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch
@@ -1,4 +1,4 @@
-From f4a32cb8e79a1b96763a49698efb4c47fbb8ee4f Mon Sep 17 00:00:00 2001
+From 0b9dc837fc1abb6f576c48421e4fc7db4bc8f5d9 Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Tue, 1 Mar 2016 13:02:51 -0600
Subject: [PATCH] Configurable cactus and reed natural growth heights
@@ -49,5 +49,5 @@ index 2106b0b49..55b07444e 100644
if (j >= (byte) range(3, ((100.0F / worldserver.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot
--
-2.17.1
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch
index 15838eaa44..ab54b8d75d 100644
--- a/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch
+++ b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch
@@ -1,4 +1,4 @@
-From bade12a066ada64083a1daf5fc32fb5a14b6bf68 Mon Sep 17 00:00:00 2001
+From b2087fc3339513038a7930819666f0fdc0e658e1 Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Tue, 1 Mar 2016 13:09:16 -0600
Subject: [PATCH] Configurable baby zombie movement speed
@@ -25,7 +25,7 @@ index 098bd3fba..912611cf1 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index de818d618..6333d2234 100644
+index 7783b5791..0240cef74 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -21,7 +21,7 @@ public class EntityZombie extends EntityMonster {
@@ -50,5 +50,5 @@ index de818d618..6333d2234 100644
}
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch
index f919218484..638db391cf 100644
--- a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch
+++ b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch
@@ -1,4 +1,4 @@
-From 2afe3ea7a4250da4d96188478296fa730ce63a9b Mon Sep 17 00:00:00 2001
+From 240b7f7dd0fb5db55639bfb8d89afc8c0b5be479 Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Tue, 1 Mar 2016 13:14:11 -0600
Subject: [PATCH] Configurable fishing time ranges
@@ -37,5 +37,5 @@ index c899a99eb..b10de807e 100644
}
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch
index a758e3b2e9..ed7bea03fc 100644
--- a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch
+++ b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch
@@ -1,4 +1,4 @@
-From 7c8195f46ff705cfc7a46c21106ee408888467b3 Mon Sep 17 00:00:00 2001
+From 707abbdbec330465f469dbcdb681ba4f40bed7c7 Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Tue, 1 Mar 2016 13:24:16 -0600
Subject: [PATCH] Allow nerfed mobs to jump
@@ -31,7 +31,7 @@ index 2e869004c..8a6856e0f 100644
this.b.setJumping(this.a);
this.a = false;
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index e0434ff12..25b613249 100644
+index 7ee5eb987..e3603685b 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -32,6 +32,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -81,5 +81,5 @@ index 0f0dc7277..43908b040 100644
public void e() {
if (this.a.getRandom().nextFloat() < 0.8F) {
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch
index 49f264ad6c..d6eafd6487 100644
--- a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch
@@ -1,4 +1,4 @@
-From 489eaf7838b02a8c749d5b3322f22f58ae5f54ef Mon Sep 17 00:00:00 2001
+From 304877d731851ff356c497d69c2ab8f5943a3c7c Mon Sep 17 00:00:00 2001
From: Suddenly
Date: Tue, 1 Mar 2016 13:51:54 -0600
Subject: [PATCH] Add configurable despawn distances for living entities
@@ -30,7 +30,7 @@ index 6d6a68cb1..284568641 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 25b613249..6e84d6532 100644
+index e3603685b..e1c254dd5 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -622,11 +622,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -48,5 +48,5 @@ index 25b613249..6e84d6532 100644
} else if (d0 < 1024.0D) {
this.ticksFarFromPlayer = 0;
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch
index db92d4ac6f..e688e6643c 100644
--- a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch
+++ b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch
@@ -1,4 +1,4 @@
-From abaf524aa29e451b1d24a0584dcb402a0438be0b Mon Sep 17 00:00:00 2001
+From e94943ac122bf5ad88188d2154869dd248cf4e3b Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Thu, 3 Mar 2016 03:53:43 -0600
Subject: [PATCH] Allow for toggling of spawn chunks
@@ -20,7 +20,7 @@ index 284568641..8ee2b9bb1 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 542262fc8..53757ee20 100644
+index 0087bd9b1..28e67245a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -152,6 +152,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -32,5 +32,5 @@ index 542262fc8..53757ee20 100644
this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
}
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 04fa07f69d..c3b49f6fa9 100644
--- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -1,4 +1,4 @@
-From 8fef6035f0ea836e8208b66289ed875dc03c7119 Mon Sep 17 00:00:00 2001
+From 0d02917faaabe3e4f15f1a313926804bc6d2d5a8 Mon Sep 17 00:00:00 2001
From: Byteflux
Date: Tue, 1 Mar 2016 14:14:15 -0600
Subject: [PATCH] Drop falling block and tnt entities at the specified height
@@ -24,7 +24,7 @@ index 8ee2b9bb1..d59b82b7b 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5ae12e266..384b892a4 100644
+index 2d8c37d73..706bab8a1 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1814,6 +1814,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -36,7 +36,7 @@ index 5ae12e266..384b892a4 100644
public EntityItem a(ItemStack itemstack, float f) {
if (itemstack.isEmpty()) {
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 20cb7dbaf..0342c873a 100644
+index 4b4e71bf7..cb21ce0b1 100644
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -85,6 +85,16 @@ public class EntityFallingBlock extends Entity {
@@ -86,5 +86,5 @@ index 1094190fd..35dbed40d 100644
Validate.isTrue(newValue >= 0, "Value must be greater than or equal to 0");
Validate.isTrue(statistic.getType() == Type.ENTITY, "This statistic does not take an EntityType parameter");
--
-2.25.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index f34d8a8bc0..db5cd15639 100644
--- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -1,4 +1,4 @@
-From c6a8ec94558adb3989105fa9bed3b84877e18810 Mon Sep 17 00:00:00 2001
+From f2c62a81754d979f3fa97d173a70a27352ccb8c7 Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Tue, 1 Mar 2016 14:32:43 -0600
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
-index 3f35a28b..cf00f35a 100644
+index 3f35a28ba..cf00f35a5 100644
--- a/src/main/java/net/minecraft/server/EULA.java
+++ b/src/main/java/net/minecraft/server/EULA.java
@@ -70,7 +70,7 @@ public class EULA {
@@ -19,10 +19,10 @@ index 3f35a28b..cf00f35a 100644
throwable = throwable1;
throw throwable1;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 49c0764f..9117fcfd 100644
+index 4dc691775..2b3844ae5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1330,7 +1330,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant
Date: Mon, 27 May 2019 03:40:05 -0500
Subject: [PATCH] Implement Paper VersionChecker
@@ -126,7 +126,7 @@ index 000000000..5deed3e25
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 48a191ae0..21bfdf9e7 100644
+index 50a69e4cb..9fed3cd5d 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -293,6 +293,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -142,5 +142,5 @@ index 48a191ae0..21bfdf9e7 100644
/**
--
-2.24.1
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch
index cabbd895bf..e1d47be91c 100644
--- a/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch
+++ b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch
@@ -1,11 +1,11 @@
-From eff79b832f995fb9394e5d7a749db0fbde4999fb Mon Sep 17 00:00:00 2001
+From 5afaae6ebc8d1bf522cee00d8cef33821bcad970 Mon Sep 17 00:00:00 2001
From: Kyle Wood
Date: Thu, 1 Mar 2018 19:37:52 -0600
Subject: [PATCH] Add version history to version command
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index ded51d042b..513cddb9bd 100644
+index 5deed3e25..49a38c660 100644
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -25,7 +25,10 @@ public class PaperVersionFetcher implements VersionFetcher {
@@ -42,7 +42,7 @@ index ded51d042b..513cddb9bd 100644
}
diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
new file mode 100644
-index 0000000000..aac3f66cb2
+index 000000000..aac3f66cb
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java
@@ -0,0 +1,145 @@
@@ -192,10 +192,10 @@ index 0000000000..aac3f66cb2
+ }
+}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index ce3ca4830e..895049287c 100644
+index e636433b1..a78896dc8 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -172,6 +172,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -173,6 +173,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return false;
}
com.destroystokyo.paper.PaperConfig.registerCommands();
@@ -204,5 +204,5 @@ index ce3ca4830e..895049287c 100644
this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals);
--
-2.22.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
index 8c15df1a2e..2617d01ece 100644
--- a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
@@ -1,11 +1,11 @@
-From 2bb7bc0363be41f9ab07fe70282b52dfc32f3a65 Mon Sep 17 00:00:00 2001
+From 54a20d91ce0ef3e854dfc89bea1b34ee94554197 Mon Sep 17 00:00:00 2001
From: Jedediah Smith
Date: Tue, 1 Mar 2016 14:47:52 -0600
Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 33470b594..bf5e949c3 100644
+index 1adeeb9c4..747f5eeb6 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -71,6 +71,9 @@ public abstract class EntityHuman extends EntityLiving {
@@ -69,5 +69,5 @@ index 35dbed40d..f7a4fdb83 100644
@Override
public void updateCommands() {
--
-2.25.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
index 1c3a8a3af7..43cb7cf64e 100644
--- a/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
@@ -1,4 +1,4 @@
-From aafa39f2c1441391d0ccf971113495d782ed68ea Mon Sep 17 00:00:00 2001
+From 25bc4ba2c424139f3a547e135bf830164fd857b6 Mon Sep 17 00:00:00 2001
From: Byteflux
Date: Tue, 1 Mar 2016 15:08:03 -0600
Subject: [PATCH] Remove invalid mob spawner tile entities
@@ -20,5 +20,5 @@ index 5f9031257..f62429277 100644
System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
+ " (" + getType(blockposition) + ") where there was no entity tile!");
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch
index e43c29c591..8f73495dc3 100644
--- a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch
+++ b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch
@@ -1,4 +1,4 @@
-From ae64864f32d5c93aafbde72778c4bec2f343559f Mon Sep 17 00:00:00 2001
+From 35a616343d39f558da5ef9e28b9321df2dc689fe Mon Sep 17 00:00:00 2001
From: Aikar
Date: Sun, 8 Mar 2015 22:55:25 -0600
Subject: [PATCH] Optimize TileEntity Ticking
@@ -182,5 +182,5 @@ index 68737be5e..17c39edca 100644
public boolean a(EntityHuman entityhuman) {
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
index 57ed41f31a..4171d6fde7 100644
--- a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
@@ -1,4 +1,4 @@
-From 049e41c77685600f9b77890820704ae2cf3300cf Mon Sep 17 00:00:00 2001
+From 5892731b5b164988c9063a63a9df78d6a7af129c Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 1 Mar 2016 23:09:29 -0600
Subject: [PATCH] Further improve server tick loop
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b9b4e04ad..983b6906e 100644
+index 2b3844ae5..7b8c523e6 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -160,7 +160,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
+ ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch
index d554f605ed..7cec4d413a 100644
--- a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch
@@ -1,4 +1,4 @@
-From e95304620ecb6fec01564333a4c012787b513870 Mon Sep 17 00:00:00 2001
+From 5b50bfeefeb9e701e1f5e75c9ca849b82b0b6c52 Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Tue, 1 Mar 2016 23:12:03 -0600
Subject: [PATCH] Only refresh abilities if needed
@@ -24,5 +24,5 @@ index f7a4fdb83..918045408 100644
@Override
--
-2.25.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
index 34d5830f8d..1f8a3474cc 100644
--- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
@@ -1,11 +1,11 @@
-From fec6c0a48a5a02df39161b7b8be75639cb0735f2 Mon Sep 17 00:00:00 2001
+From f394d66b388a13b0538381f70c637c2154cf5bdb Mon Sep 17 00:00:00 2001
From: Byteflux
Date: Tue, 1 Mar 2016 23:45:08 -0600
Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2c36fc71c..29e6b88d2 100644
+index 706bab8a1..ecf9f9f76 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -167,6 +167,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -51,10 +51,10 @@ index 2c36fc71c..29e6b88d2 100644
NBTTagList nbttaglist = new NBTTagList();
double[] adouble1 = adouble;
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 0342c873a..c3c3e58ce 100644
+index cb21ce0b1..40fd012ae 100644
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-@@ -252,6 +252,14 @@ public class EntityFallingBlock extends Entity {
+@@ -253,6 +253,14 @@ public class EntityFallingBlock extends Entity {
this.block = Blocks.SAND.getBlockData();
}
@@ -101,10 +101,10 @@ index 5406f4c40..d778eac45 100644
if (i >= 0 && i < this.list.size()) {
NBTBase nbtbase = (NBTBase) this.list.get(i);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 924dd5e7f..0584cd314 100644
+index bc1ff7d56..948438829 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1164,6 +1164,11 @@ public class WorldServer extends World {
+@@ -1174,6 +1174,11 @@ public class WorldServer extends World {
this.navigators.add(((EntityInsentient) entity).getNavigation());
}
entity.valid = true; // CraftBukkit
@@ -134,5 +134,5 @@ index c82c21326..a29693674 100644
+ // Paper end
}
--
-2.24.1
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch
index 48351a765d..bd2ffd3808 100644
--- a/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,4 +1,4 @@
-From 8fb5fc5d8d43a02dbfa67bae041deff8c09989c2 Mon Sep 17 00:00:00 2001
+From 2065a0021b8e509b2b91bb778ff36e7164470362 Mon Sep 17 00:00:00 2001
From: Aikar
Date: Tue, 1 Mar 2016 23:52:34 -0600
Subject: [PATCH] Prevent tile entity and entity crashes
@@ -23,7 +23,7 @@ index fa6400dcc..e2f3cec74 100644
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 53757ee20..5793ebd00 100644
+index 28e67245a..806768aeb 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -687,11 +687,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -64,5 +64,5 @@ index 53757ee20..5793ebd00 100644
}
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
index fe6991ae36..48cd2f9a77 100644
--- a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
@@ -1,4 +1,4 @@
-From b72bf1ab0143c458b17f8fe333df6f52c7d1c8af Mon Sep 17 00:00:00 2001
+From 66cc209a149c04e13e7100ffa03174f3256ef3f0 Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Tue, 1 Mar 2016 23:58:50 -0600
Subject: [PATCH] Configurable top of nether void damage
@@ -29,7 +29,7 @@ index d59b82b7b..f7a0a33e4 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 29e6b88d2..2aea9ba50 100644
+index ecf9f9f76..1ce080287 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -407,9 +407,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -96,5 +96,5 @@ index e7fc442c8..1b64ad824 100644
// this.doPortalTick(); // CraftBukkit - handled in postTick
if (this.world.isClientSide) {
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch
index d7dfb7fbb5..722bc1c503 100644
--- a/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch
@@ -1,11 +1,11 @@
-From c152aca8fcec30e72124c9311bbeae06f6aa1c34 Mon Sep 17 00:00:00 2001
+From 6d8ac7f73c806da3041acc6f0af36b81acf64b2e Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Wed, 2 Mar 2016 00:03:55 -0600
Subject: [PATCH] Check online mode before converting and renaming player data
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 97bac7d257..a0254d8e51 100644
+index 97bac7d25..a0254d8e5 100644
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -164,7 +164,7 @@ public class WorldNBTStorage implements IPlayerFileData {
@@ -18,5 +18,5 @@ index 97bac7d257..a0254d8e51 100644
file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
if ( file.exists() )
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch
index 88cf951c12..238f696ced 100644
--- a/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch
+++ b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch
@@ -1,11 +1,11 @@
-From 8576f528af0499d34185a87f3f3435d7eceea674 Mon Sep 17 00:00:00 2001
+From 180acebaa18e225da5408a5fcaee99729b8bd110 Mon Sep 17 00:00:00 2001
From: Zach Brown
Date: Wed, 2 Mar 2016 00:32:25 -0600
Subject: [PATCH] Always tick falling blocks
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 106e9d7e2d..7341dc2c1c 100644
+index 442383969..f86404f83 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -13,6 +13,7 @@ import net.minecraft.server.EntityCreature;
@@ -25,5 +25,5 @@ index 106e9d7e2d..7341dc2c1c 100644
|| entity instanceof EntityFireworks
|| entity instanceof EntityThrownTrident )
--
-2.21.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch
index 1b3072e401..fb9bb16425 100644
--- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch
@@ -1,4 +1,4 @@
-From 4463ac4edd3976bed5a7596736d4f9ea558630fa Mon Sep 17 00:00:00 2001
+From 8effbabd66a3a27d839b6ef5ea2a3d3d971354d4 Mon Sep 17 00:00:00 2001
From: DoctorDark
Date: Wed, 16 Mar 2016 02:21:39 -0500
Subject: [PATCH] Configurable end credits
@@ -20,7 +20,7 @@ index f7a0a33e4..50dec5cb5 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5fe744ae8..aa509b636 100644
+index ce4821092..bc0a1585d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -41,5 +41,5 @@ index 5fe744ae8..aa509b636 100644
this.cm = true;
}
--
-2.24.1
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch
index 0fca85a31e..9e768753a0 100644
--- a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch
@@ -1,11 +1,11 @@
-From 682369f59b4dab57e3950544df0c5eebd23620aa Mon Sep 17 00:00:00 2001
+From ba7b394464d30072299b40f04cfb9bbfe859f848 Mon Sep 17 00:00:00 2001
From: Iceee
Date: Wed, 2 Mar 2016 01:39:52 -0600
Subject: [PATCH] Fix lag from explosions processing dead entities
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 4033f680c..4398f7441 100644
+index 4b1bba1c9..d2c31ac1f 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -151,7 +151,14 @@ public class Explosion {
@@ -37,5 +37,5 @@ index c75ed9ddc..c1f462d9d 100644
return !(entity instanceof EntityHuman) || !entity.isSpectator() && !((EntityHuman) entity).isCreative();
};
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0032-Optimize-explosions.patch b/Spigot-Server-Patches/0032-Optimize-explosions.patch
index 458c8ef522..ae5a69ae7a 100644
--- a/Spigot-Server-Patches/0032-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From eec5541d4e4b72b627794f842de2b26d94865944 Mon Sep 17 00:00:00 2001
+From b75d6749802e94b6b8699d9513fe0a111d373ab6 Mon Sep 17 00:00:00 2001
From: Byteflux
Date: Wed, 2 Mar 2016 11:59:48 -0600
Subject: [PATCH] Optimize explosions
@@ -123,10 +123,10 @@ index d2c31ac1f..64cf5a29c 100644
+ // Paper end
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 983b6906e..81d3a5262 100644
+index 7b8c523e6..3d580a666 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1170,6 +1170,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant
Date: Wed, 2 Mar 2016 14:48:03 -0600
Subject: [PATCH] Disable explosion knockback
@@ -19,10 +19,10 @@ index f038d3f7d..25e071718 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 906ca1bfa..e38be6eba 100644
+index 35e3f1c78..9bd673700 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1071,6 +1071,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1073,6 +1073,7 @@ public abstract class EntityLiving extends Entity {
}
}
@@ -30,7 +30,7 @@ index 906ca1bfa..e38be6eba 100644
if (flag1) {
if (flag) {
this.world.broadcastEntityEffect(this, (byte) 29);
-@@ -1089,6 +1090,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1091,6 +1092,7 @@ public abstract class EntityLiving extends Entity {
b0 = 2;
}
@@ -38,7 +38,7 @@ index 906ca1bfa..e38be6eba 100644
this.world.broadcastEntityEffect(this, b0);
}
-@@ -1112,6 +1114,8 @@ public abstract class EntityLiving extends Entity {
+@@ -1114,6 +1116,8 @@ public abstract class EntityLiving extends Entity {
}
}
@@ -48,7 +48,7 @@ index 906ca1bfa..e38be6eba 100644
if (!this.f(damagesource)) {
SoundEffect soundeffect = this.getSoundDeath();
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 069ffb141..8e134ba89 100644
+index 64cf5a29c..8762a566d 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -193,14 +193,14 @@ public class Explosion {
@@ -69,5 +69,5 @@ index 069ffb141..8e134ba89 100644
}
}
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0034-Disable-thunder.patch b/Spigot-Server-Patches/0034-Disable-thunder.patch
index e1f16da1e4..7328435b23 100644
--- a/Spigot-Server-Patches/0034-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0034-Disable-thunder.patch
@@ -1,4 +1,4 @@
-From b2aec65ac322df62cebdd5deb0cfaa32a2d94714 Mon Sep 17 00:00:00 2001
+From af390b8d5170b906a3d0ffe790f153f561f9e511 Mon Sep 17 00:00:00 2001
From: Sudzzy
Date: Wed, 2 Mar 2016 14:52:43 -0600
Subject: [PATCH] Disable thunder
@@ -19,7 +19,7 @@ index 25e071718..41436a4ea 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0584cd314..387136140 100644
+index 948438829..5adb59172 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -446,7 +446,7 @@ public class WorldServer extends World {
@@ -32,5 +32,5 @@ index 0584cd314..387136140 100644
if (this.isRainingAt(blockposition)) {
DifficultyDamageScaler difficultydamagescaler = this.getDamageScaler(blockposition);
--
-2.24.1
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
index 03f45dae83..67f71d3186 100644
--- a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
@@ -1,4 +1,4 @@
-From ea36944e4b2f0f7c0edff0ff49ce97e08870ba48 Mon Sep 17 00:00:00 2001
+From 113e75e1dda3f6ba8ec9bef997ab5068c2cf4de0 Mon Sep 17 00:00:00 2001
From: Sudzzy
Date: Wed, 2 Mar 2016 14:57:24 -0600
Subject: [PATCH] Disable ice and snow
@@ -19,7 +19,7 @@ index 41436a4ea..f53d8b967 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 387136140..c40aebc41 100644
+index 5adb59172..173e3857e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -466,7 +466,7 @@ public class WorldServer extends World {
@@ -32,5 +32,5 @@ index 387136140..c40aebc41 100644
BlockPosition blockposition1 = blockposition.down();
BiomeBase biomebase = this.getBiome(blockposition);
--
-2.24.1
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch
index 85e7e37225..1a9b5d7556 100644
--- a/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch
@@ -1,4 +1,4 @@
-From a5c5c4e007001bce2c77cf3267946058c89d7b06 Mon Sep 17 00:00:00 2001
+From 11d856c9142722c092742373c440eb2dd8f6ecf2 Mon Sep 17 00:00:00 2001
From: Sudzzy
Date: Wed, 2 Mar 2016 15:03:53 -0600
Subject: [PATCH] Configurable mob spawner tick rate
@@ -64,5 +64,5 @@ index 813de2a6d..deb32db2b 100644
}
--
-2.24.0
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch
index 3fc74873a8..814fa8d5b1 100644
--- a/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch
@@ -1,4 +1,4 @@
-From f412c674a6f0cae1ba9680b6f8666c9d49f87813 Mon Sep 17 00:00:00 2001
+From b4faae88abba8ea23a3d5a3b1f30d1be8e1983f1 Mon Sep 17 00:00:00 2001
From: Jedediah Smith
Date: Wed, 2 Mar 2016 23:13:07 -0600
Subject: [PATCH] Send absolute position the first time an entity is seen
@@ -77,10 +77,10 @@ index a75e0ec54..a13fd9b34 100644
this.c();
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index cd1579750..17275c35f 100644
+index dcfb37004..89433004d 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -1181,10 +1181,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1186,10 +1186,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
private final Entity tracker;
private final int trackingDistance;
private SectionPosition e;
@@ -97,7 +97,7 @@ index cd1579750..17275c35f 100644
this.tracker = entity;
this.trackingDistance = i;
this.e = SectionPosition.a(entity);
-@@ -1266,7 +1270,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1271,7 +1275,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
entityplayer.removeQueue.remove(Integer.valueOf(this.tracker.getId()));
// CraftBukkit end
@@ -107,5 +107,5 @@ index cd1579750..17275c35f 100644
}
} else if (this.trackedPlayers.remove(entityplayer)) {
--
-2.24.1
+2.25.0.windows.1
diff --git a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch
index 6f8bb534f4..cbfa77d980 100644
--- a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch
@@ -1,11 +1,11 @@
-From d2e4d23521f1cc249c8ac8f6a5cc93c5c83240db Mon Sep 17 00:00:00 2001
+From f3f2ed87c739c1d162682a01e484e8460f62bc8e Mon Sep 17 00:00:00 2001
From: Byteflux