Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 1e843b72 #510: Add NamespacedKey#fromString() to fetch from user input a4d18241 #581: Add methods to modify despawn delay for wandering villagers CraftBukkit Changes: 0cd8f19f #802: Add methods to modify despawn delay for wandering villagers d5c5d998 SPIGOT-6362: ConcurrentModificationException: null --> Server Crash 8c7d69fe SPIGOT-5228: Entities that are removed during chunk unloads are not properly removed from the chunk.
2024-11-22 02:25:28 +01:00 · 2021-02-16 17:08:29 +00:00 · 2021-02-16 17:08:29 +00:00 · 0ea3083817
commit 0ea3083817
parent 088fa6f28b
180 changed files with 327 additions and 326 deletions
--- a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch
+++ b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization

 diff --git a/pom.xml b/pom.xml
-index db8ebc72f9ddfb33a3aa3d2e0366ef4f6f324567..30253c7c0da5c5940fab16df0f118e1b167712e8 100644
+index ed19c62e5a2dbc7e660eae61aef21295afdb8aaf..58fc279186e01a4703102227f387e96272fcf0a7 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -49,6 +49,12 @@
--- a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@ -68,7 +68,7 @@ index 1f8095141bdbfabb1e487d93f33f636e83084386..00738355e42704de583b60833d4fb39a
      * Gets the name of the update folder. The update folder is used to safely
      * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ff46ea6aa545c910acaa7e5a7690e88e0129608c..695d80d8aabdbb4a6553d5446a8f7ea766b52472 100644
+index 85c242034d125e5760952900557b10418ec5605b..5553f465e45238b2f6c4041e2b5a58aea727543c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -482,6 +482,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
@ -429,7 +429,7 @@ index 0000000000000000000000000000000000000000..5105dfcee646718cd8abc79d1d8062a5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 695d80d8aabdbb4a6553d5446a8f7ea766b52472..c12087cd9551ad254867c428139bdf38b5c7770c 100644
+index 5553f465e45238b2f6c4041e2b5a58aea727543c..7889e98443d1192ae633ff64584f00255725c9bd 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2,6 +2,7 @@ package org.bukkit.entity;
--- a/Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch
@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.

 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d355453d5b166e8fa0c6a8c992169b0b54e5127b..fefbe857676bdab750379a9d6c120099817a83e8 100644
+index b8a33ac504da73ec990550bdd23e4548f6ccba95..5432b2713ab110a1d41bdf7372a5807426ab5443 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -40,6 +40,33 @@ import org.jetbrains.annotations.Nullable;
--- a/Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch
@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7e90c11066a7882a8ea4dfa757323616fb88e612..a0b9f03cba3ddd3708b898df8f405c8595c18775 100644
+index b422abde1a504aa36c726e1c0597da11c1b6afd0..7295e8c12cb1333da4f954b2c77e5794141839f8 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;
--- a/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch
@ -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 a0b9f03cba3ddd3708b898df8f405c8595c18775..a489718adee9eb78a02d0a75198c4ec7af844a99 100644
+index 7295e8c12cb1333da4f954b2c77e5794141839f8..86a7ba58ef26ef0053c516408b47f7ba4cb0b80b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -738,12 +738,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
--- a/Spigot-API-Patches/0091-Add-Ban-Methods-to-Player-Objects.patch
+++ b/Spigot-API-Patches/0091-Add-Ban-Methods-to-Player-Objects.patch
@ -74,7 +74,7 @@ index 58313929f81509030216a0e5e3869da63e11108e..6cf05fed701c67a2c797a4e0839c7958
     /**
      * 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 58a1e24f15043b21a1a99931cde628990a66831f..e471728b2ab69c5f8568896030e4866c5bf258a1 100644
+index 7d3bf348e4a4b0b68042df4d72a98285c0e0da94..1ba7e5c66159d8ff208f3e796a3e6569e060967c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -4,6 +4,10 @@ import java.net.InetSocketAddress;
--- a/Spigot-API-Patches/0094-Additional-world.getNearbyEntities-API-s.patch
+++ b/Spigot-API-Patches/0094-Additional-world.getNearbyEntities-API-s.patch
@ -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 833f4cb13e9d3d1d0daa1ac1202a70e2606c80b8..f36360e9dbfa6daa3450c275764ea1e90e446da6 100644
+index 5432b2713ab110a1d41bdf7372a5807426ab5443..4bffb3cadebb2081e8caae6b9d127591345411e6 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -1,6 +1,9 @@
--- a/Spigot-API-Patches/0115-Add-World.getEntity-UUID-API.patch
+++ b/Spigot-API-Patches/0115-Add-World.getEntity-UUID-API.patch
@ -5,7 +5,7 @@ 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 1f02f9a96eac55e14383a8a381be6473c014442f..79267ebf4fd0d5ea3fc37f62bf50c4064f62fc8d 100644
+index aa0e0b6d916e5ba01470ea94f9fd6fe0b2a7b4cf..ab4f09cf5651a260c23e53da9576767462b62c7c 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -914,6 +914,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/0128-Remove-deadlock-risk-in-firing-async-events.patch
+++ b/Spigot-API-Patches/0128-Remove-deadlock-risk-in-firing-async-events.patch
@ -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 5e988ac7a639476c0f80786c8aea51ba3377fd10..d6451c82e0189e2c591a0fc1f884e83931d5a41b 100644
+index 6d010cdebcb490b57618d3865fdb776a023853bf..cd46036960aac542a3ced9a8cdfcb1d35913cb76 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;
--- a/Spigot-API-Patches/0131-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/Spigot-API-Patches/0131-Provide-Chunk-Coordinates-as-a-Long-API.patch
@ -44,7 +44,7 @@ index beac1439c71fb28f1a3baecf56157237e12ccfd5..fa576096e908f8fbdbef53e1bd91215a
      * 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 79267ebf4fd0d5ea3fc37f62bf50c4064f62fc8d..ff132bd7677e384debf2399ba9b1ffdb932541e9 100644
+index ab4f09cf5651a260c23e53da9576767462b62c7c..0b77f7f0a27743e1c1ce4283ed53958845f9f9cc 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -207,6 +207,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/0132-Async-Chunks-API.patch
+++ b/Spigot-API-Patches/0132-Async-Chunks-API.patch
@ -8,7 +8,7 @@ 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 a09cbfa277c82522be406ef079aa32d921c67799..d7367f6819fa0feb535293da301da862f0dd850e 100644
+index 0b77f7f0a27743e1c1ce4283ed53958845f9f9cc..6851a96be62815ffb2d129ec3b98495dffa508ce 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -221,6 +221,482 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/Spigot-API-Patches/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
@ -48,7 +48,7 @@ index 369ce9ff6c8bb97a64a8e229115564412e6e7654..e700875beb76dadd55b585aca748338d
      * @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 210f1ccf7a26598ab6353374dcb5c6e6dd34c42f..3b9c41cc93943bdd569ac5ebe281753a3beb65dc 100644
+index 6851a96be62815ffb2d129ec3b98495dffa508ce..accee84428cb16be47dc5cf75993622c96958e62 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -90,6 +90,38 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/0138-isChunkGenerated-API.patch
+++ b/Spigot-API-Patches/0138-isChunkGenerated-API.patch
@ -34,7 +34,7 @@ index e700875beb76dadd55b585aca748338def286908..9c91c49ed7302c12fcb1d8e9bc58712e
     /**
      * 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 3b9c41cc93943bdd569ac5ebe281753a3beb65dc..9b8f354d79e6aad67faf5fc587df76264ceeac37 100644
+index accee84428cb16be47dc5cf75993622c96958e62..de607fe0a2e864dc66d9341b233d0d8b120db1f9 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -254,6 +254,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/0147-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/Spigot-API-Patches/0147-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@ -199,10 +199,10 @@ index 0000000000000000000000000000000000000000..28f3fda950999a9c964a3608042ca605
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index 22eca2a180618ed43a4ef103bebd134897d6c71a..620a962df6d871c7a3b7728030a05ade772135c2 100644
+index 803fa0019869127ee8c7e4fb1777a59c43e66f8a..549b2342b8b63c00b402e6cf8a7c612ac6b45fe7 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
-@@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
  * underscores, hyphens, and forward slashes.
  *
  */
@ -211,7 +211,7 @@ index 22eca2a180618ed43a4ef103bebd134897d6c71a..620a962df6d871c7a3b7728030a05ade
 
     /**
      * The namespace representing all inbuilt keys.
-@@ -83,11 +83,13 @@ public final class NamespacedKey {
+@@ -84,11 +84,13 @@ public final class NamespacedKey {
     }
 
     @NotNull
--- a/Spigot-API-Patches/0168-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/Spigot-API-Patches/0168-Add-ItemStack-Recipe-API-helper-methods.patch
@ -24,7 +24,7 @@ index d742c4058ba9aed4fbe1591fd755a06608b06e98..222a12baa8e93ad686ab59426653f066
      * 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 84062dd719cb8a6142dc8c806777cb208c6b42b2..ddcf84e6609abe8379cca2ff99983ce3efbab805 100644
+index 84062dd719cb8a6142dc8c806777cb208c6b42b2..7f6d3c71c5b3a9aa54c84a4c3b7c3614a0d477ce 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 {
--- a/Spigot-API-Patches/0178-Add-Heightmap-API.patch
+++ b/Spigot-API-Patches/0178-Add-Heightmap-API.patch
@ -103,7 +103,7 @@ index d5d67b3d84cd88ed0f858497e68535ec0162c700..432d5711b7ec34eafeb27df82d367612
      * 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 11d5df94788794da99572c57baec12ee1e58e0b1..85f549c7593c417d280fb31ce5cfdaf89f2f8dd2 100644
+index ad915c2a190fa5bb50cbf88dfd99798918c75a47..607d46e819867b20549b6b2717a9b2b3c37797b5 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -160,6 +160,87 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/0198-Expose-game-version.patch
+++ b/Spigot-API-Patches/0198-Expose-game-version.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b7d260fd7d1a869fb0d04e29012d540f49d9b82a..c020912df1625da34a9f29ee2ea74835e9ae1e79 100644
+index 6a8e8b039e0c6473a540824ae1f22b1ab321d6ca..31b2150a7c3c93aa2581a85095a60e17aa469ea6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -118,6 +118,18 @@ public final class Bukkit {
@ -28,7 +28,7 @@ index b7d260fd7d1a869fb0d04e29012d540f49d9b82a..c020912df1625da34a9f29ee2ea74835
      * Gets a view of all currently logged in players. This {@linkplain
      * Collections#unmodifiableCollection(Collection) view} is a reused
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2dfecdd73f911f657ee30c4848c903c522d97bcb..13bf8dcc23986ad4f3761d9b395d278df7caa958 100644
+index 0269120a74d6368647ef3ad84d8c55640d38c152..7daad551f79a5d4d1ba4e63708fd59843fde7c2e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -97,6 +97,16 @@ public interface Server extends PluginMessageRecipient {
--- a/Spigot-API-Patches/0217-Add-setMaxPlayers-API.patch
+++ b/Spigot-API-Patches/0217-Add-setMaxPlayers-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 62cc1c74c11f56dcbd1e24e9c5478497742e6351..bfe842364ee0a4bf39dacdbb6972477d57a4ef8a 100644
+index e340ef507d5a2b6b14114d0f061679c1a90884d4..9ec0608a79bc9cf3a992f9e549fd471e10e6bb5e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -171,6 +171,17 @@ public final class Bukkit {
@ -27,7 +27,7 @@ index 62cc1c74c11f56dcbd1e24e9c5478497742e6351..bfe842364ee0a4bf39dacdbb6972477d
      * Get the game port that the server runs on.
      *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6e01bf2d52e8bb6de7395f50c12f16c64aef72ae..7c0a788900c93c29d14d8c45ac5ae3317cf4a94e 100644
+index 73537af41d010283221418084c244261f262ceab..69070e472518fba66581e6050d3308d46c1d1608 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -144,6 +144,15 @@ public interface Server extends PluginMessageRecipient {
--- a/Spigot-API-Patches/0218-Add-moon-phase-API.patch
+++ b/Spigot-API-Patches/0218-Add-moon-phase-API.patch
@ -47,7 +47,7 @@ index 0000000000000000000000000000000000000000..df05153397b42930cd53d37b30824c7e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index fe7d2e3ee04d0df51bfa1d64e21e6930ccc5e943..146c1f2048eefa25c44c921812832b9b42c5cba3 100644
+index 9b12fbec82017d8cbb21b5a8c3d563f1974dc1c5..042baabf18f86a9c915db7e9d515f26f840a12d7 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -70,6 +70,12 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Spigot-API-Patches/0257-Better-AnnotationTest-printout.patch
+++ b/Spigot-API-Patches/0257-Better-AnnotationTest-printout.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Better AnnotationTest printout


 diff --git a/pom.xml b/pom.xml
-index 1c33b1f4d2366116dd45478b8ad9cdb51fd6bb57..35599164b24185bc51813ae58090f6f4bffdba4a 100644
+index 7747189d49727eea039f3994e186b34480025144..6c6ae6b48094c86c74cd4e9f4214056f63e6ac68 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -223,6 +223,19 @@
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@ -533,10 +533,10 @@ index 0000000000000000000000000000000000000000..b31109d2dadd29e8852468c19265066b
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 49cfd12dd8f68468d7a122f5420687c874cf3317..84407dfd46138359d42ddf8fd5c462a5f494d46b 100644
+index d1051f05933be093fa598504e169e5cfdaa1b0e3..056e1fced00dff1d6507a90c13f2448a04ca0558 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -273,15 +273,15 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -281,15 +281,15 @@ public class ChunkProviderServer extends IChunkProvider {
         }
     }
 
--- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
+++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
@ -485,7 +485,7 @@ index 998101592723abb26c91d1f92e98be1cf24c954d..ee9069c744df63cbb7f21dd9d28d6d55
     }
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f0a66359f532f5f7cb84b2e6fe600a1416e92365..514bf059b21b9d74813c4af8d8ee594be1f01eac 100644
+index f7e1d35b69906f165adbf346e28047d2b44862c0..cd260f0cbde31b5127bf3a73b9c946746defc348 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1556,9 +1556,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -848,10 +848,10 @@ index 83d799bec90693e0fbbf8a7f3bc4f569b5c0ead9..141a8e31151010e5a0bd8d4661033f10
 
                 t0.a(nbttagcompound.getCompound("data"));
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c37af6dffb17e31c81843f0e25cef57dce8b1d45..6a8321184068888a9d3a699e5fa357ad3e73ee2c 100644
+index 4955ec276c389158727fb98710dd700145c31be8..f1c206b6b506aff09c484730dd2d5ce796c3c2ab 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1798,7 +1798,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1809,7 +1809,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
             }
 
             // CraftBukkit - decompile error
--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0004-MC-Utils.patch
@ -2746,7 +2746,7 @@ index ae61d0a7676bf06c8c9aa5c68ccb8dd4baf326b6..b12e43ed13a1a9d7d418831b8988c30a
     }
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 84407dfd46138359d42ddf8fd5c462a5f494d46b..20f62f6f7704f47f86179d03b4e55a61e0149627 100644
+index 056e1fced00dff1d6507a90c13f2448a04ca0558..08f11f98c40221fa4ce9a4f14ee8398f8588f38a 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -17,6 +17,10 @@ import java.util.function.Consumer;
@ -2928,7 +2928,7 @@ index 84407dfd46138359d42ddf8fd5c462a5f494d46b..20f62f6f7704f47f86179d03b4e55a61
 
     public ChunkProviderServer(WorldServer worldserver, Convertable.ConversionSession convertable_conversionsession, DataFixer datafixer, DefinedStructureManager definedstructuremanager, Executor executor, ChunkGenerator chunkgenerator, int i, boolean flag, WorldLoadListener worldloadlistener, Supplier<WorldPersistentData> supplier) {
         this.world = worldserver;
-@@ -90,6 +246,49 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -98,6 +254,49 @@ public class ChunkProviderServer extends IChunkProvider {
         this.cacheChunk[0] = ichunkaccess;
     }
 
@ -2978,7 +2978,7 @@ index 84407dfd46138359d42ddf8fd5c462a5f494d46b..20f62f6f7704f47f86179d03b4e55a61
     @Nullable
     @Override
     public IChunkAccess getChunkAt(int i, int j, ChunkStatus chunkstatus, boolean flag) {
-@@ -372,10 +571,9 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -380,10 +579,9 @@ public class ChunkProviderServer extends IChunkProvider {
 
             this.p = spawnercreature_d;
             this.world.getMethodProfiler().exit();
@ -3934,7 +3934,7 @@ index 8bdda63a2807635e8780481244251f6e35c13627..36a7e41cc5036345929ebf4d2fa160a8
         int j = 0;
         ChunkSection[] achunksection = chunk.getSections();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 80118f5a347f5cc21945172b2cc94ad3f640a75e..7b4717ffc31bc406c04d98207a15804502bd3579 100644
+index f645d3dfb57e99757e233ee2bbb51be5094203cb..985fc002fa5afc71ecd242aa8101684b2c751b30 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -21,9 +21,9 @@ public class PlayerChunk {
@ -3959,7 +3959,7 @@ index 80118f5a347f5cc21945172b2cc94ad3f640a75e..7b4717ffc31bc406c04d98207a158045
     public PlayerChunk(ChunkCoordIntPair chunkcoordintpair, int i, LightEngine lightengine, PlayerChunk.c playerchunk_c, PlayerChunk.d playerchunk_d) {
         this.statusFutures = new AtomicReferenceArray(PlayerChunk.CHUNK_STATUSES.size());
         this.fullChunkFuture = PlayerChunk.UNLOADED_CHUNK_FUTURE;
-@@ -54,16 +56,63 @@ public class PlayerChunk {
+@@ -54,10 +56,49 @@ public class PlayerChunk {
         this.ticketLevel = this.oldTicketLevel;
         this.n = this.oldTicketLevel;
         this.a(i);
@ -3993,24 +3993,25 @@ index 80118f5a347f5cc21945172b2cc94ad3f640a75e..7b4717ffc31bc406c04d98207a158045
 +
 +    public final boolean isEntityTickingReady() {
 +        return this.isEntityTickingReady;
-     }
- 
+    }
+
 +    public final boolean isTickingReady() {
 +        return this.isTickingReady;
 +    }
 +
 +    public final boolean isFullChunkReady() {
 +        return this.isFullChunkReady;
-+    }
+     }
 +    // Paper end
-+
+ 
     // CraftBukkit start
 -    public Chunk getFullChunk() {
 +    public final Chunk getFullChunk() { // Paper - final for inline
         if (!getChunkState(this.oldTicketLevel).isAtLeast(PlayerChunk.State.BORDER)) return null; // note: using oldTicketLevel for isLoaded checks
-         CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> statusFuture = this.getStatusFutureUnchecked(ChunkStatus.FULL);
-         Either<IChunkAccess, PlayerChunk.Failure> either = (Either<IChunkAccess, PlayerChunk.Failure>) statusFuture.getNow(null);
-         return either == null ? null : (Chunk) either.left().orElse(null);
+         return this.getFullChunkUnchecked();
+     }
+@@ -68,6 +109,14 @@ public class PlayerChunk {
+         return (either == null) ? null : (Chunk) either.left().orElse(null);
     }
     // CraftBukkit end
 +    // Paper start - "real" get full chunk immediately
@ -4024,7 +4025,7 @@ index 80118f5a347f5cc21945172b2cc94ad3f640a75e..7b4717ffc31bc406c04d98207a158045
 
     public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getStatusFutureUnchecked(ChunkStatus chunkstatus) {
         CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = (CompletableFuture) this.statusFutures.get(chunkstatus.c());
-@@ -75,20 +124,23 @@ public class PlayerChunk {
+@@ -79,20 +128,23 @@ public class PlayerChunk {
         return getChunkStatus(this.ticketLevel).b(chunkstatus) ? this.getStatusFutureUnchecked(chunkstatus) : PlayerChunk.UNLOADED_CHUNK_ACCESS_FUTURE;
     }
 
@ -4052,7 +4053,7 @@ index 80118f5a347f5cc21945172b2cc94ad3f640a75e..7b4717ffc31bc406c04d98207a158045
         CompletableFuture<Either<Chunk, PlayerChunk.Failure>> completablefuture = this.a();
         Either<Chunk, PlayerChunk.Failure> either = (Either) completablefuture.getNow(null); // CraftBukkit - decompile error
 
-@@ -113,7 +165,7 @@ public class PlayerChunk {
+@@ -117,7 +169,7 @@ public class PlayerChunk {
         return null;
     }
 
@ -4061,7 +4062,7 @@ index 80118f5a347f5cc21945172b2cc94ad3f640a75e..7b4717ffc31bc406c04d98207a158045
         return this.chunkSave;
     }
 
-@@ -254,11 +306,11 @@ public class PlayerChunk {
+@@ -258,11 +310,11 @@ public class PlayerChunk {
         });
     }
 
@ -4075,7 +4076,7 @@ index 80118f5a347f5cc21945172b2cc94ad3f640a75e..7b4717ffc31bc406c04d98207a158045
         return this.ticketLevel;
     }
 
-@@ -329,13 +381,27 @@ public class PlayerChunk {
+@@ -333,13 +385,27 @@ public class PlayerChunk {
 
         this.hasBeenLoaded |= flag3;
         if (!flag2 && flag3) {
@ -4104,7 +4105,7 @@ index 80118f5a347f5cc21945172b2cc94ad3f640a75e..7b4717ffc31bc406c04d98207a158045
             this.a(((CompletableFuture<Either<Chunk, PlayerChunk.Failure>>) completablefuture).thenApply((either1) -> { // CraftBukkit - decompile error
                 playerchunkmap.getClass();
                 return either1.ifLeft(playerchunkmap::a);
-@@ -346,12 +412,24 @@ public class PlayerChunk {
+@@ -350,12 +416,24 @@ public class PlayerChunk {
         boolean flag5 = playerchunk_state1.isAtLeast(PlayerChunk.State.TICKING);
 
         if (!flag4 && flag5) {
@ -4131,7 +4132,7 @@ index 80118f5a347f5cc21945172b2cc94ad3f640a75e..7b4717ffc31bc406c04d98207a158045
             this.tickingFuture = PlayerChunk.UNLOADED_CHUNK_FUTURE;
         }
 
-@@ -363,12 +441,24 @@ public class PlayerChunk {
+@@ -367,12 +445,24 @@ public class PlayerChunk {
                 throw (IllegalStateException) SystemUtils.c((Throwable) (new IllegalStateException()));
             }
 
@ -4501,7 +4502,7 @@ index 5719ef9714e9680596a08c42c33508c16c0e676a..bb0f30f182856d2701fde9b1a65eeb98
         return this.j.m();
     }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 170332ce35db120b53f99a45869882236c361960..c96ad91b15920293e228f5eb7d0843beda92faec 100644
+index f1c206b6b506aff09c484730dd2d5ce796c3c2ab..592af06de1fc02d94273363c2ede1175a39997f0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -12,6 +12,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap.Entry;
@ -4521,7 +4522,7 @@ index 170332ce35db120b53f99a45869882236c361960..c96ad91b15920293e228f5eb7d0843be
     boolean tickingEntities;
     private final MinecraftServer server;
     public final WorldDataServer worldDataServer; // CraftBukkit - type
-@@ -1567,7 +1568,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1578,7 +1579,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
                 ObjectIterator objectiterator = spawnercreature_d.b().object2IntEntrySet().iterator();
 
                 while (objectiterator.hasNext()) {
--- a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
+++ b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
@ -19,7 +19,7 @@ index b8868b86338ce0e89bc74eccccf714b910d7a4fe..9cb2f3b31921870ddba044840e99eb04
                     MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                     ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.chunkX, e.chunkZ);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 54bbd1ca159d85bb90187edfcca1c38586c3557f..f6b97eec33ace01077e6bca58f3c11978422ac47 100644
+index f2fb9e661b6c2d87348c9144d32e568cc6ada5dc..b8267cf23f795fd7e586b0e567037eae5048d08e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -51,7 +51,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@ -758,10 +758,10 @@ index 853e11836b6c4eadd03feead101bf578b17b86a3..0aea16df16b55b1d4756b51d10c8c22d
         }
     }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 20f62f6f7704f47f86179d03b4e55a61e0149627..dd78f093f6ee9822c4a31d87f3c83d2f8fa4fcf8 100644
+index 08f11f98c40221fa4ce9a4f14ee8398f8588f38a..a066026bce318683dcc022920dad39d7ec25e485 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -314,11 +314,13 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -322,11 +322,13 @@ public class ChunkProviderServer extends IChunkProvider {
             }
 
             gameprofilerfiller.c("getChunkCacheMiss");
@ -777,7 +777,7 @@ index 20f62f6f7704f47f86179d03b4e55a61e0149627..dd78f093f6ee9822c4a31d87f3c83d2f
             ichunkaccess = (IChunkAccess) ((Either) completablefuture.join()).map((ichunkaccess1) -> {
                 return ichunkaccess1;
             }, (playerchunk_failure) -> {
-@@ -505,7 +507,9 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -513,7 +515,9 @@ public class ChunkProviderServer extends IChunkProvider {
 
     public void save(boolean flag) {
         this.tickDistanceManager();
@ -787,7 +787,7 @@ index 20f62f6f7704f47f86179d03b4e55a61e0149627..dd78f093f6ee9822c4a31d87f3c83d2f
     }
 
     @Override
-@@ -542,7 +546,9 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -550,7 +554,9 @@ public class ChunkProviderServer extends IChunkProvider {
         this.tickDistanceManager();
         this.world.timings.doChunkMap.stopTiming(); // Spigot
         this.world.getMethodProfiler().exitEnter("chunks");
@ -797,7 +797,7 @@ index 20f62f6f7704f47f86179d03b4e55a61e0149627..dd78f093f6ee9822c4a31d87f3c83d2f
         this.world.timings.doChunkUnload.startTiming(); // Spigot
         this.world.getMethodProfiler().exitEnter("unload");
         this.playerChunkMap.unloadChunks(booleansupplier);
-@@ -566,8 +572,10 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -574,8 +580,10 @@ public class ChunkProviderServer extends IChunkProvider {
             boolean flag2 = world.ticksPerAnimalSpawns != 0L && worlddata.getTime() % world.ticksPerAnimalSpawns == 0L; // CraftBukkit
 
             this.world.getMethodProfiler().enter("naturalSpawnCount");
@ -808,7 +808,7 @@ index 20f62f6f7704f47f86179d03b4e55a61e0149627..dd78f093f6ee9822c4a31d87f3c83d2f
 
             this.p = spawnercreature_d;
             this.world.getMethodProfiler().exit();
-@@ -578,7 +586,9 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -586,7 +594,9 @@ public class ChunkProviderServer extends IChunkProvider {
 
                 if (optional.isPresent()) {
                     this.world.getMethodProfiler().enter("broadcast");
@ -818,7 +818,7 @@ index 20f62f6f7704f47f86179d03b4e55a61e0149627..dd78f093f6ee9822c4a31d87f3c83d2f
                     this.world.getMethodProfiler().exit();
                     Optional<Chunk> optional1 = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left();
 
-@@ -592,25 +602,25 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -600,25 +610,25 @@ public class ChunkProviderServer extends IChunkProvider {
                                 SpawnerCreature.a(this.world, chunk, spawnercreature_d, this.allowAnimals, this.allowMonsters, flag2);
                             }
 
@ -1683,7 +1683,7 @@ index 6df28adb17d78a7f5189787a979a44fad677f05c..09577ddcb3c2432a0af6047b287a387d
             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 c96ad91b15920293e228f5eb7d0843beda92faec..21e4088cfdb7218e78fb771fe4c9bd2027594663 100644
+index 592af06de1fc02d94273363c2ede1175a39997f0..3d915105b277a7cbf330ba2cb3c2f1451ee868e4 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -2,6 +2,8 @@ package net.minecraft.server;
--- a/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch
+++ b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch
@ -25,7 +25,7 @@ index 3618cc017feb60e257a28f67cbddca3f792a9833..796c17e0941922a9716212c6eae91643
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index a3f608e3a06abfa4268278b6f1298ece36264a02..d07847876e22971b4a90f67d8281bf08361424e0 100644
+index f4c74db7c15fc8112b759516b7ab2c7bca6186b7..422632c9050d0bcc5398ac5d4cf51801cea9cdda 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -21,7 +21,7 @@ import org.bukkit.event.entity.EntityTransformEvent;
--- a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
+++ b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
@ -31,7 +31,7 @@ index 2e869004c8c6b8bfbb002fb4eda04519d50390c8..22eb89df768819f0a18f91b806b56ace
         this.b.setJumping(this.a);
         this.a = false;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a6534087b10c9a469a3d2cf4da717fab17b31544..bbb66e90aba2332c7c87a173639efc6ad61f5d53 100644
+index 03933c24ed4d97e16bcebf6b89b1a8d1fc43cd0b..ae96ff73f78a514328862de86d3ecdb29fa9c145 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1020,6 +1020,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -43,7 +43,7 @@ index a6534087b10c9a469a3d2cf4da717fab17b31544..bbb66e90aba2332c7c87a173639efc6a
         return this.isInWater() || this.isInRain() || this.k();
     }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 09ac187ba8ff52f6fa1f0d5d00a138518bacb50a..59af58e1aed678b8eac83f2346f5822aff700fb7 100644
+index 03bfd29c12e7dd6e359481ffb56fddad1a44492a..be24030f9c23da21e2f7c98cb0df5e7229109d26 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -33,6 +33,7 @@ public abstract class EntityInsentient extends EntityLiving {
--- 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
@ -30,7 +30,7 @@ index b41e7922dd96c3358eb849ab39982a75736e3476..2f0d582baf0eb2bb477944d0cb1369db
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 59af58e1aed678b8eac83f2346f5822aff700fb7..c80d7f72a55ae92587ba8a4618787fb712bdaf23 100644
+index be24030f9c23da21e2f7c98cb0df5e7229109d26..15b0d48e9dfe707b2859564b33206085f5a4e0db 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -698,14 +698,14 @@ public abstract class EntityInsentient extends EntityLiving {
--- a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch
+++ b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch
@ -20,7 +20,7 @@ index 2f0d582baf0eb2bb477944d0cb1369db6ca33956..89e76dd73811fd0f6f8c8e7e5af804d5
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e24c5e20f128e787f0a0e58716944dd8748f73c1..3f2ca3874f743c635fd6a7f6c18d554425a0c056 100644
+index 09577ddcb3c2432a0af6047b287a387de5d2920a..0f602de85bc7002150247b6cb26c6905f0e4f585 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -165,6 +165,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
--- 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
@ -24,7 +24,7 @@ index 89e76dd73811fd0f6f8c8e7e5af804d5a4bb5a75..d16ae924bcbe31c964f7fb448757c748
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bbb66e90aba2332c7c87a173639efc6ad61f5d53..47e1845ca967210d15bf2beba32442ec8b1bde34 100644
+index ae96ff73f78a514328862de86d3ecdb29fa9c145..09bab3828197e3078a4ed95e7c8a9f34e8bf1b8d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1765,6 +1765,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch
+++ b/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch
@ -126,7 +126,7 @@ index 0000000000000000000000000000000000000000..5deed3e25ff41ab0a4015a5fd0c1e952
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 4075553d0abe19442903add9854f61cd657ab0ce..e1a8a4fdcc74dcd40b5230e84d56e97d4706ae36 100644
+index d63a160f1b00de8d67ae1eb4fefbd5ca06835de7..8a4ee9e4762141b05c0e79f387823414102e6382 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -343,6 +343,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
--- a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Player affects spawning API


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0f47b10c9c3357f7a462680e2f26d7808a5f8afc..14646561f8fe661ba2b815c1abfb81af61f027d4 100644
+index 09bab3828197e3078a4ed95e7c8a9f34e8bf1b8d..dc996792df6046d442565a7993ec299af6605d92 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1269,6 +1269,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
@ -5,7 +5,7 @@ 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 3e37374eba5d806a8e776924e034d26b06f26766..f20c6f1d2118a5f3feaace82f1c472c8ebbd26c0 100644
+index dc996792df6046d442565a7993ec299af6605d92..c6b91de58c0190aca0455aacc04994f8ea5d81b7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -162,6 +162,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -101,7 +101,7 @@ index ad8a506bb430b26fe147a657a2f826daf9bf4d45..ad4807e0bdd6409bd798f995da8f43ce
         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 da01aac42b32af6831a69f49e43d77fd6d5704ca..5c5229a815f098411450f6affb883c40c170fb2e 100644
+index 21e4088cfdb7218e78fb771fe4c9bd2027594663..89c22be536a45199a29d328b125bdcb9c2848d65 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1135,6 +1135,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {
--- a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch
@ -29,7 +29,7 @@ index d16ae924bcbe31c964f7fb448757c748e5c4418c..4bba6977a0287837b8927718c040ac61
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 26ad7e7d44dc1195f7ab948d2b42bf629c2702a7..52595b6534e2798b36b3a7c2d97451bd0ea2f3a0 100644
+index c6b91de58c0190aca0455aacc04994f8ea5d81b7..d3e7a49a4161d68733cfba8d9ffd1cd9821ab2e3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -415,9 +415,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/0032-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch
@ -123,7 +123,7 @@ index afe61a1ddc75f155836411b6749198f71ed09919..ac39b02ec5f02f6f2db9f293513686d2
 +    // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 775306d7e59ff135004e54d2d055bd05edba7e61..4d3cb70f1567b042e1605b30637706560bd883d9 100644
+index 478dfe231720324e995dc4123fbf19b9ce26c16e..5b4b6810586761072a790b7bbe3368d26cd5bb13 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1207,6 +1207,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -135,7 +135,7 @@ index 775306d7e59ff135004e54d2d055bd05edba7e61..4d3cb70f1567b042e1605b3063770656
 
         this.methodProfiler.exitEnter("connection");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index fb26ec91ecdeaa94a6247c064b7c6191a43927eb..d8ff91fea7d00f035bac0fa7378dcf675a719857 100644
+index bc1946ea3060220f4598aae2e1aed3d84ab18387..e062f68b87bd70b128f46394881c09ad63278fdc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -84,6 +84,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
--- a/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
@ -19,7 +19,7 @@ index 4881b03d470646843bad1bc343eb6a6ab9072d8e..2222c1bb5f8625eee4d88946e4bfdfa2
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ef00abc40fa1645f6e7420aba703b3a382276844..b32e8da5f5891f71ec54909e83d57089286b2d84 100644
+index d41638b97188ba58d2456d2f6c3c71fc79fe572a..9295f72aa5a2a95efa89fdc90ae7106540403042 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1190,6 +1190,7 @@ public abstract class EntityLiving extends Entity {
--- a/Spigot-Server-Patches/0034-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0034-Disable-thunder.patch
@ -19,7 +19,7 @@ index 2222c1bb5f8625eee4d88946e4bfdfa2fe598977..083e421f8496b5336af473b108498ed2
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 5c5229a815f098411450f6affb883c40c170fb2e..5d3ac78e6a5366ea94425924de41175495a3e906 100644
+index 89c22be536a45199a29d328b125bdcb9c2848d65..d61d1d5b15c14e673ca17648c66335991194b7bf 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -475,7 +475,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
--- a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
@ -19,7 +19,7 @@ index 083e421f8496b5336af473b108498ed28b984774..2f7a5a4a5a7b29750cfd777e0bc5d19a
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 5d3ac78e6a5366ea94425924de41175495a3e906..ef7b76c4a9b5bafa4780922558538bbdcd783120 100644
+index d61d1d5b15c14e673ca17648c66335991194b7bf..07f2cf8461343f054828a32f8bf48563321e666a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -499,7 +499,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
--- 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
@ -5,7 +5,7 @@ Subject: [PATCH] Send absolute position the first time an entity is seen


 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 0c3f5dd54af8afe2c29c7c89d0f5f2663b79e151..7519438674c08ee6a1464e63a1b98723d5fe3100 100644
+index 62a7db8c7d2604d248ec5c1efb3c43356c3d513c..dec48226d713ef0198ef3c679daf553a9d05a099 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
--- a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Disable spigot tick limiters


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d8ff91fea7d00f035bac0fa7378dcf675a719857..1a6e39e34186534d4784d4fddffa45dfd2496840 100644
+index e062f68b87bd70b128f46394881c09ad63278fdc..193d5973b69cf3d4c408ccbc924d91ff9a06b382 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -655,9 +655,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
--- a/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Change implementation of (tile)entity removal list
 use sets for faster removal

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1a6e39e34186534d4784d4fddffa45dfd2496840..70d6ed9a226ab114b090017cec6998a740b2cb66 100644
+index 193d5973b69cf3d4c408ccbc924d91ff9a06b382..eb0af6775d60e2cd610dde6e7c4874d4b01d6054 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -37,7 +37,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
--- a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch
@ -23,7 +23,7 @@ index 416a6760883cb40367535c7c5acd779742bb8af5..670efbe53241a0ae32d618c83da601cc
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 52595b6534e2798b36b3a7c2d97451bd0ea2f3a0..eb67002cbb9aa9e40702282286fd9d98f3f4440e 100644
+index d3e7a49a4161d68733cfba8d9ffd1cd9821ab2e3..26022146538dd9fb443304966c0905f19a6902c6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2528,7 +2528,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch
@ -25,7 +25,7 @@ index abbbe1786eb68af02f9d39650aad730ac44aac8a..3ac2ac3db9b1c271b3c21930bb137166
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index eb67002cbb9aa9e40702282286fd9d98f3f4440e..0f3f680306af918951321c92332d9ea8833ed4d2 100644
+index 26022146538dd9fb443304966c0905f19a6902c6..99edd9811f9bd9f2150fcc83459d58063156ca26 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2199,6 +2199,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -37,7 +37,7 @@ index eb67002cbb9aa9e40702282286fd9d98f3f4440e..0f3f680306af918951321c92332d9ea8
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b32e8da5f5891f71ec54909e83d57089286b2d84..fb43d55e6bc2e1641daedb4662d36ce0bbae221e 100644
+index 9295f72aa5a2a95efa89fdc90ae7106540403042..276f06982b3c17b8ae29497e1f561bb7d1559e29 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -648,6 +648,7 @@ public abstract class EntityLiving extends Entity {
--- a/Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0063-Handle-Item-Meta-Inconsistencies.patch
@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.

 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 10b98ba59570ae12797fa29533a6e56701849527..dce861df47403ae7f7c5f0f541f3f7abf0abe0cc 100644
+index 7d98fe348d6b4a3bc2972217f9a9f0c9d902edbd..eee69f9ac8936cf7ad84629aba91bf09371762f3 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -9,6 +9,8 @@ import com.mojang.serialization.Codec;
--- a/Spigot-Server-Patches/0065-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0065-Add-World-Util-Methods.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index db637b5f9ed4180844ddc12dc53050a89a4d163d..bfa9b3482251341947da8e6c4def762bf7d725b7 100644
+index 3638ae7c0eba5b1ef811bc1629334e9c483bef6f..4a25c3d77a960dd256aeffdac08bb035b9429f63 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -245,11 +245,27 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -51,7 +51,7 @@ index bb0f30f182856d2701fde9b1a65eeb987462104a..717f495abd63218bb7ce9241e7cfeac8
         return (double) (blockposition.getX() + 1) > this.e() && (double) blockposition.getX() < this.g() && (double) (blockposition.getZ() + 1) > this.f() && (double) blockposition.getZ() < this.h();
     }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ef7b76c4a9b5bafa4780922558538bbdcd783120..01fde964fa2fae3cfefc4b9e8e2c59a997d09539 100644
+index 07f2cf8461343f054828a32f8bf48563321e666a..6a57b9337d3f345197a127b16e3799d0c58fab2d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -88,7 +88,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
--- a/Spigot-Server-Patches/0068-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0068-Use-a-Shared-Random-for-Entities.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 02ad0b959e636d0f93cfd491b7b549364f92fbb6..1769e9b0f3d358253b6387491589916f7bb219fe 100644
+index 99edd9811f9bd9f2150fcc83459d58063156ca26..487d041999fd1edc4b48790dbc975cf8cea8ba54 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -58,6 +58,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/0069-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0069-Configurable-spawn-chances-for-skeleton-horses.patch
@ -22,7 +22,7 @@ index 3c78d3234054ce2dc46ef77decb6adb0cbd10620..cd64fb9d0c6d123e1c86cb33f12cd9ce
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 01fde964fa2fae3cfefc4b9e8e2c59a997d09539..51afd8277d1b00e299c44d198faa64179940a8ec 100644
+index 6a57b9337d3f345197a127b16e3799d0c58fab2d..4029f090d7b01c10b4f3f99004ab92f04653e884 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -479,7 +479,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
--- a/Spigot-Server-Patches/0070-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0070-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@ -33,7 +33,7 @@ index f6a5ebd4c7ec045c8dd6841831f8fcc0b32d964e..63a9ce32fb8b98695e104f7d820cd9b1
         this.a = i;
         this.b = j;
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 81c6ce3ba87da692675bca8b2831a90fabfa4e37..b6ff6095543d720382786e159a9f1cdd6eb6f166 100644
+index 01655fd86f9a3218036f8b5404e233d32e0904a5..9ef17a2ad31c8e11ba433b49aa9a31cf8df57dc8 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -312,12 +312,27 @@ public class Chunk implements IChunkAccess {
@ -192,7 +192,7 @@ index 5cfddbfe0bd84c994ed7fa4968bcf4fc13381001..420bf7116def909d3dd7dc9a79972344
     @Override
     public Fluid getFluid(BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4aa4a8d10b5126125ae420037c5e1faabdbe147b..096a1d3bf0e9c51244ecd9ad2fbd240f3e01f461 100644
+index 4a25c3d77a960dd256aeffdac08bb035b9429f63..7c6127739f1d88ee0dc411db5fcaa37d7fff36f7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -187,7 +187,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
--- a/Spigot-Server-Patches/0071-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/Spigot-Server-Patches/0071-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@ -32,7 +32,7 @@ index 48eb9c8a68d45c88c7a42e8e400446a374fb4fc9..2c8d49501664862559ed8974b4821bdd
         }
         // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4d3cb70f1567b042e1605b30637706560bd883d9..2193e395e05bbfcd32f95445c85b65ee4dca5ed4 100644
+index 5b4b6810586761072a790b7bbe3368d26cd5bb13..a3913ee0756f79159ea0671c9041ab68db0aa121 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1173,6 +1173,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -44,7 +44,7 @@ index 4d3cb70f1567b042e1605b30637706560bd883d9..2193e395e05bbfcd32f95445c85b65ee
             this.methodProfiler.a(() -> {
                 return worldserver + " " + worldserver.getDimensionKey().a();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index babf153a3cdf13e7055269adace3948f180925fe..4dfc49ba09e3c4a6f58c74f3ea71a22ce63dbc36 100644
+index 7c6127739f1d88ee0dc411db5fcaa37d7fff36f7..5ce86030a71c181c4c28b8934be4fa8c7eafc299 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -406,7 +406,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -66,7 +66,7 @@ index babf153a3cdf13e7055269adace3948f180925fe..4dfc49ba09e3c4a6f58c74f3ea71a22c
                     this.getServer().getPluginManager().callEvent(event);
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 51afd8277d1b00e299c44d198faa64179940a8ec..058d222b97c2698518f165f5a5b59fb2aed565fa 100644
+index 4029f090d7b01c10b4f3f99004ab92f04653e884..7e44af3e933f16fc00cd2b43e913f87380fb1cae 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -87,6 +87,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
--- a/Spigot-Server-Patches/0072-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0072-Entity-AddTo-RemoveFrom-World-Events.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events


 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 058d222b97c2698518f165f5a5b59fb2aed565fa..f2d3ca17cd136db1e669477c15e660a8d39b0534 100644
+index 7e44af3e933f16fc00cd2b43e913f87380fb1cae..d199191220b5afc42d639f316878501c91514a50 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1103,7 +1103,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
--- a/Spigot-Server-Patches/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4dfc49ba09e3c4a6f58c74f3ea71a22ce63dbc36..1f4b9740557b58bd78a7683e69310853094b172b 100644
+index 5ce86030a71c181c4c28b8934be4fa8c7eafc299..d6ee6aae693519a379b4a6ba26642d5ef78e4deb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -466,6 +466,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
--- a/Spigot-Server-Patches/0084-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0084-Remove-unused-World-Tile-Entity-List.patch
@ -67,10 +67,10 @@ index d6ee6aae693519a379b4a6ba26642d5ef78e4deb..369a6b42a89fd75aeb3da4930f47b691
             }
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d199191220b5afc42d639f316878501c91514a50..4be09328cea0808c3a41681aea860cd04f799bbd 100644
+index dbb022fb186b181b9b1912adfaebbb00fa1c7d4b..486ba1efc934c6851d2b570493af6e1079a7abd5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1600,7 +1600,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1611,7 +1611,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
             }
 
             bufferedwriter.write(String.format("entities: %d\n", this.entitiesById.size()));
@ -79,7 +79,7 @@ index d199191220b5afc42d639f316878501c91514a50..4be09328cea0808c3a41681aea860cd0
             bufferedwriter.write(String.format("block_ticks: %d\n", this.getBlockTickList().a()));
             bufferedwriter.write(String.format("fluid_ticks: %d\n", this.getFluidTickList().a()));
             bufferedwriter.write("distance_manager: " + playerchunkmap.e().c() + "\n");
-@@ -1739,7 +1739,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1750,7 +1750,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
 
     private void a(Writer writer) throws IOException {
         CSVWriter csvwriter = CSVWriter.a().a("x").a("y").a("z").a("type").a(writer);
--- a/Spigot-Server-Patches/0086-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0086-Configurable-Player-Collision.patch
@ -19,7 +19,7 @@ index 772f48ca940b235481dd27669d9370e53f5380dd..042cb74c9c55366d91e98449bd51ad2b
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2193e395e05bbfcd32f95445c85b65ee4dca5ed4..cfa8ae00bfa5583c9e744180faccc607bc9508ba 100644
+index a3913ee0756f79159ea0671c9041ab68db0aa121..31cc60dcf998cf07ca8db14dba37145ed5b3601c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -432,6 +432,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
--- a/Spigot-Server-Patches/0091-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0091-EntityRegainHealthEvent-isFastRegen-API.patch
@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started

 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e011051946ffcff17fd8fd24d49e7f204da41bfd..8365987a845fc23fdad99e101df5b5154d555bbb 100644
+index d20f405287fb25fd4b221345b0845a0c6713298e..cda084e6fe8f4f5dcd8c0b13bd07326db2ca7c59 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1037,10 +1037,16 @@ public abstract class EntityLiving extends Entity {
--- a/Spigot-Server-Patches/0093-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0093-remove-null-possibility-for-getServer-singleton.patch
@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cfa8ae00bfa5583c9e744180faccc607bc9508ba..f45ff52fe33876251dea312155bf30b4bdbfa865 100644
+index 31cc60dcf998cf07ca8db14dba37145ed5b3601c..68c6ccf0576752b836079a3c5352102182a6127e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -70,6 +70,7 @@ import org.spigotmc.SlackActivityAccountant; // Spigot
--- a/Spigot-Server-Patches/0095-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0095-LootTable-API-Replenishable-Lootables-Feature.patch
@ -518,7 +518,7 @@ index 0000000000000000000000000000000000000000..a1923aff2b5e2e867670a5a064a76791
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b56a3b6afbfd901344db8c562e4f0aabb0c0a3f3..3c2aaf4123e11c453741891d1664a6d44c62799c 100644
+index 487d041999fd1edc4b48790dbc975cf8cea8ba54..0dd63d2e0ed16eb08cf97dbf8c293e24a5a1bda9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -73,6 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -646,7 +646,7 @@ index 9265bc7331f5d3cb43394a7457ab89140b731c8b..d9be182a574daaedcc7a106c759c2bde
 
             if (entityhuman != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index da5a80267b189d75374375211a574ca5f18d96be..26cc40e57f5b73b9c32859bff37c4a3d94904c56 100644
+index df71eb9672ecc69ac92c773925d9b692ad343fee..8a7e9302b4b6be086144add8df610b76b58e00d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -64,7 +64,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
--- a/Spigot-Server-Patches/0098-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0098-Optimize-UserCache-Thread-Safe.patch
@ -23,7 +23,7 @@ index 7b52bf335e60a700b4c4e25cab1b0261f32775bc..dc0cb79525adf0d5afee1f677e1fde54
 
         if (!NameReferencingFileConverter.e(this)) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f45ff52fe33876251dea312155bf30b4bdbfa865..365719e9f6228f19dfb598d4850dc7ef69377f7c 100644
+index 68c6ccf0576752b836079a3c5352102182a6127e..7e4a966b5748417223243344bf7c4483e997a237 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -787,7 +787,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -36,7 +36,7 @@ index f45ff52fe33876251dea312155bf30b4bdbfa865..365719e9f6228f19dfb598d4850dc7ef
         // Spigot end
 
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index ce81aaf3e6ae97ad2af2aad6b668bdd4e18abcf1..15222ed19f049b7465a43a8651584a8a4c5fd666 100644
+index 337ae3f8d57c665db796f4498aeffb2e4581da76..f61cf940f21288fc6e8faf9519d2366436146d1f 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
@@ -106,7 +106,7 @@ public class UserCache {
--- a/Spigot-Server-Patches/0100-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0100-Optional-TNT-doesn-t-move-in-water.patch
@ -32,7 +32,7 @@ index eb04fdb172a50ec1f5b7fe78fa0e7655246abd60..6eca3f300020006f02dd36253b522db4
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3c2aaf4123e11c453741891d1664a6d44c62799c..39ff3589582e19108c896220be1917fefd5e80a7 100644
+index 0dd63d2e0ed16eb08cf97dbf8c293e24a5a1bda9..6aa29495802b7d52c4c0f283495c7d1762f657fa 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2681,6 +2681,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -93,7 +93,7 @@ index e25404fd89ad6317c2656c68c2e32aa05e5f0e73..b108874d977a4fb1a7c0d52f66bc0839
 +    // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 7519438674c08ee6a1464e63a1b98723d5fe3100..216445778ce8432fe2506cd7ac4312f43f42ba33 100644
+index dec48226d713ef0198ef3c679daf553a9d05a099..c346ca8ba30da401ea1a421e8ce6ed1d5b6e4c13 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -38,7 +38,7 @@ public class EntityTrackerEntry {
--- a/Spigot-Server-Patches/0101-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0101-Faster-redstone-torch-rapid-clock-removal.patch
@ -77,7 +77,7 @@ index d88d435b7777f731bc0bb728ebe4d4cb31c6376e..a63a60348fe45f63deec6fcb27b6be09
         public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
             this.a = blockposition;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9c90f13d179146c0af0ea3e8990f762ca74e5789..6e3f29d40e35e583d8ace7e1e25dc2171414c2b0 100644
+index 369a6b42a89fd75aeb3da4930f47b6917a1ae393..9ac1f42372a18c0907c7b0137b6a83022e3e984d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -90,6 +90,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
--- a/Spigot-Server-Patches/0102-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0102-Add-server-name-parameter.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add server-name parameter


 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 061a3bc88fcce6877bc976d3b7989dea22b0a120..868a67c5023e61960d6225de8ad1506c46177733 100644
+index a34b1ba17e6f7121ed70c3d95ec8f4aa24f1ef5c..78b6d00ea40e8d7c450e08e444c5231e7c99969b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -137,6 +137,14 @@ public class Main {
--- a/Spigot-Server-Patches/0104-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0104-Fix-Double-World-Add-issues.patch
@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state

 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index b9107796833f036977dab4e388ce822307985e20..9599f1141c90e803ca0a9cd9b15ed1205beca8eb 100644
+index a4d666480f0211d39e62b82e43100e3d436f4d90..b27ebc0726ecd13062f5cbf49edca2e5cfa4a4c3 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -927,6 +927,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
--- a/Spigot-Server-Patches/0106-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0106-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Don't lookup game profiles that have no UUID and no name


 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 15222ed19f049b7465a43a8651584a8a4c5fd666..7171bdf7fb0489e9678588dfa33410984015ea3f 100644
+index f61cf940f21288fc6e8faf9519d2366436146d1f..e89c92aded564fe689cc1aa8d0c83abb72f7b10c 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
@@ -89,7 +89,7 @@ public class UserCache {
--- a/Spigot-Server-Patches/0111-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0111-Chunk-registration-fixes.patch
@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent

 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9599f1141c90e803ca0a9cd9b15ed1205beca8eb..8e005ead10a9ac738b0e626239926bbf30e16695 100644
+index b27ebc0726ecd13062f5cbf49edca2e5cfa4a4c3..e23a5f446a1e357493f5232c39baa45f7386a637 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -736,7 +736,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
--- a/Spigot-Server-Patches/0121-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0121-Don-t-let-fishinghooks-use-portals.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Don't let fishinghooks use portals


 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 9db1c891b69d4fbe163b3272f22351f3d0b306d1..9ab0a4638c36d46327435eec4745d2746819d9b0 100644
+index ad2ec3472a164bdf3a1ff2c42ec18c74ad58a13c..0e5bbe285bcbb410cc442eba1738aeb2a117ce62 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -201,6 +201,11 @@ public class EntityFishingHook extends IProjectile {
--- a/Spigot-Server-Patches/0124-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0124-Optimize-World.isLoaded-BlockPosition-Z.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6e3f29d40e35e583d8ace7e1e25dc2171414c2b0..d44554916691411e3e376ffb04dc2f182c603a29 100644
+index 9ac1f42372a18c0907c7b0137b6a83022e3e984d..7deac857ab2218d7caa71a8b7b42fea0ab200b96 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -252,6 +252,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
--- a/Spigot-Server-Patches/0127-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0127-Optimize-ItemStack.isEmpty.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary

 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index dce861df47403ae7f7c5f0f541f3f7abf0abe0cc..74de67380094261cb93264d760ddbbbd5cce8220 100644
+index eee69f9ac8936cf7ad84629aba91bf09371762f3..2b2f5a8ac100c93b4c17d808b19a8252ed175760 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -154,7 +154,7 @@ public final class ItemStack {
--- a/Spigot-Server-Patches/0128-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0128-Add-API-methods-to-control-if-armour-stands-can-move.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move


 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 6aaa4f6f519a4438cdde64c2246b364efa078904..7f002225887f41829f85afcae021aff6cc3dfc9f 100644
+index ad3c2f4b448fe8a49c1c43374cd5cf14114c9b16..4870a6f9f894b2c9d0fea83dad0808ac6448f808 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -45,6 +45,7 @@ public class EntityArmorStand extends EntityLiving {
--- a/Spigot-Server-Patches/0133-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0133-Provide-E-TE-Chunk-count-stat-methods.patch
@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e38b1a7258ea5be6baec9a9f40b70055499e9369..948639d629d0126c914b1b4d20f7dfaa6137e63e 100644
+index 539bc756b5341e60266d6505d81778748cd5f475..e42f27bb10b6ee279555cfee3c90a88fccad9d65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -281,6 +281,48 @@ public class CraftWorld implements World {
--- a/Spigot-Server-Patches/0135-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0135-Don-t-allow-entities-to-ride-themselves-572.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 703267fe8a9b5e9d49d3b2dbe1da93def15d1b54..170dad8be525b40d764b6e63c981f7b73775a01b 100644
+index 6aa29495802b7d52c4c0f283495c7d1762f657fa..8e306dfac0b1a0355b1a7cd84ec8c8514c172268 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1956,6 +1956,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/0136-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0136-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@ -226,10 +226,10 @@ index eedec25373cfc8adec7ac8a99b146770dc15c70e..732323ee1de01929c73bc5f98444c0f6
 
     }
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index c830b3c2145effc16314c6216be8af935416cb58..f1a509063c09e603140c74255a3fb901693d2cc5 100644
+index 86e9c9ec35153d4d6248512e2e3406ca2f3dac46..fa3e786cd6ef67da378a5d51583ca84a82677d8c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-@@ -144,7 +144,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
+@@ -145,7 +145,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
         if (merchantrecipe.isRewardExp()) {
             int i = 3 + this.random.nextInt(4);
 
--- a/Spigot-Server-Patches/0137-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0137-Cap-Entity-Collisions.patch
@ -27,7 +27,7 @@ index 2dc58b9f769ea43b737804456aafab47ecc143b8..c611b5a63498f5ad1f50a75ccd5d7299
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bd7d9949eb9a290833958d170d1ad69990406b16..bb049690ce61310a90852637397abd449c1dc43a 100644
+index 8e306dfac0b1a0355b1a7cd84ec8c8514c172268..c3cdcf7effe86f97ab6a6e7907ab6a3954faa113 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -183,6 +183,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/0138-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0138-Remove-CraftScheduler-Async-Task-Debugger.patch
@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching

 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 343cdb06881fa8b0155b56d29c110bba489f9667..f7a977c342e564b3e24034c756c128068c143a65 100644
+index 9b6d9373abb59a30c2835ca891282d07559281f5..0e0f361c3af363539d5d1d865603114bdb84fd67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -430,7 +430,7 @@ public class CraftScheduler implements BukkitScheduler {
--- a/Spigot-Server-Patches/0140-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0140-Do-not-let-armorstands-drown.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Do not let armorstands drown


 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 7f002225887f41829f85afcae021aff6cc3dfc9f..b0847b4e61e587a47fd209eb2ec3772d1486802d 100644
+index 4870a6f9f894b2c9d0fea83dad0808ac6448f808..e17637cfee773b1b79c05d7a8e6558963c7a9c14 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -837,5 +837,10 @@ public class EntityArmorStand extends EntityLiving {
@ -20,7 +20,7 @@ index 7f002225887f41829f85afcae021aff6cc3dfc9f..b0847b4e61e587a47fd209eb2ec3772d
     // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8698cecf89ce509c2fc729e0e564c01e253e2b14..91d5dc2aac5cf487db1a52b4b471a4781178cc37 100644
+index c2c5dbba5cc048e8fa2a4a383737330adf7b7663..2dfa2abf37994a72dfdfcc38e032626247b43fd7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -245,6 +245,7 @@ public abstract class EntityLiving extends Entity {
--- a/Spigot-Server-Patches/0142-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0142-Add-system-property-to-disable-book-size-limits.patch
@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.

 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index b609caf567989d850e140437971871749ad47f2e..437b22f1a038092438538013d399499153070de3 100644
+index a0cc04cb6d1f02df3018320b4147bd0b156dd81c..bcfa7080c0a01f9d0026e1bde89db00598c880c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -37,6 +37,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
--- a/Spigot-Server-Patches/0147-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0147-Item-canEntityPickup.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup


 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 61b5a3d14413455e22857f72e6b5d825f5b589d8..1b0c4234cf579b35f404c129c2c6d3266b670b09 100644
+index a819fc46bebc4b1aaae63f822087574e976e2ab8..6274cf1975270fdac8ae4986e1c170bd075d640e 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -539,6 +539,11 @@ public abstract class EntityInsentient extends EntityLiving {
--- a/Spigot-Server-Patches/0155-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0155-Entity-fromMobSpawner.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 90d2509865f5b43eb9061023a6315ac6e4f83faf..508601b29c1f10ffabcf414d97189f5cd8c0a3af 100644
+index c3cdcf7effe86f97ab6a6e7907ab6a3954faa113..f647b4975e714164313142acef04f8e320ca79cf 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -183,6 +183,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d44554916691411e3e376ffb04dc2f182c603a29..327a668f1306f1ec90e63598da925fce576e6ed5 100644
+index 7deac857ab2218d7caa71a8b7b42fea0ab200b96..aba716e98f21e1635f24323bf1f03bad84b318aa 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -673,7 +673,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
--- a/Spigot-Server-Patches/0165-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0165-LivingEntity-setKiller.patch
@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#setKiller


 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f52c2faa42c45d1d8acf7002c306a7de3aadcb86..2fe60df578ad7d6087ae86759f22421a25e5258d 100644
+index 2dfa2abf37994a72dfdfcc38e032626247b43fd7..67b5b28c6c082a616ae2114874cdb0969f95ab98 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -87,7 +87,7 @@ public abstract class EntityLiving extends Entity {
--- a/Spigot-Server-Patches/0177-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0177-use-CB-BlockState-implementations-for-captured-block.patch
@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f3ac45a5936c2fbf3b013bfbb904effed5241e15..33444cd8aec8ce39fb4fef232909cd42ef036d54 100644
+index aba716e98f21e1635f24323bf1f03bad84b318aa..d3c282eb5253351ec4288bffaeca715547089cec 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -71,7 +71,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
--- a/Spigot-Server-Patches/0186-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0186-PlayerNaturallySpawnCreaturesEvent.patch
@ -9,10 +9,10 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world

 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index dd78f093f6ee9822c4a31d87f3c83d2f8fa4fcf8..b6ec5d0f281bac483f210fd8c45a8965cd97cc02 100644
+index a066026bce318683dcc022920dad39d7ec25e485..8017953af1df6c046a47ebe655e5d1afa68d50f8 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -581,6 +581,15 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -589,6 +589,15 @@ public class ChunkProviderServer extends IChunkProvider {
             this.world.getMethodProfiler().exit();
             //List<PlayerChunk> list = Lists.newArrayList(this.playerChunkMap.f()); // Paper
             //Collections.shuffle(list); // Paper
--- a/Spigot-Server-Patches/0196-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0196-Implement-extended-PaperServerListPingEvent.patch
@ -177,7 +177,7 @@ index 0000000000000000000000000000000000000000..26ddf92f86fccc2b2562f7abf4788d1e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b14381fd33b19a511106046d0c66d58353c57e7d..983868ef2b2d9bbec19ba8a23cb6376de015b53e 100644
+index ee009052eb10125bbaca95b5fda306adbd8a9995..88b45c8b4f58ee83d625408eae08aa329c87a6d4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -2,6 +2,9 @@ package net.minecraft.server;
--- a/Spigot-Server-Patches/0197-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0197-Improved-Async-Task-Scheduler.patch
@ -159,7 +159,7 @@ index 0000000000000000000000000000000000000000..3c1992e212a6d6f1db4d5b807b38d719
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index f7a977c342e564b3e24034c756c128068c143a65..7532bbd82559763cfaf5433a07914b5fb906122c 100644
+index 0e0f361c3af363539d5d1d865603114bdb84fd67..ca90237a53c9a026919d28adaedf483ca3c7c2a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -63,7 +63,7 @@ public class CraftScheduler implements BukkitScheduler {
--- a/Spigot-Server-Patches/0212-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0212-Expand-World.spawnParticle-API-and-add-Builder.patch
@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.

 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e23a5f446a1e357493f5232c39baa45f7386a637..a1491094b58cf814d7b05d6c0ce4067bf34dae1a 100644
+index 885bf43a591492f19bd5a421ea4271854ae8f192..d192e341f0f6a3d03329dab16de3b19962091d2a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -61,7 +61,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -22,7 +22,7 @@ index e23a5f446a1e357493f5232c39baa45f7386a637..a1491094b58cf814d7b05d6c0ce4067b
     public final ChunkProviderServer chunkProvider; // Paper - public
     boolean tickingEntities;
     private final MinecraftServer server;
-@@ -1357,12 +1357,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1368,12 +1368,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {
     }
 
     public <T extends ParticleParam> int sendParticles(EntityPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
--- a/Spigot-Server-Patches/0218-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0218-ItemStack-getMaxItemUseDuration.patch
@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item

 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 74de67380094261cb93264d760ddbbbd5cce8220..1a28e6f20340920c35bcd87a0dbfdcd745c79706 100644
+index 2b2f5a8ac100c93b4c17d808b19a8252ed175760..bdb6f9bf3477f85859e3f0dd761e2e895f1a8e2b 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -552,6 +552,7 @@ public final class ItemStack {
--- a/Spigot-Server-Patches/0237-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0237-Re-add-vanilla-entity-warnings-for-duplicates.patch
@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data...
 We should kind of know about these things you know.

 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 46de86d72ddee11026bef01098a5f3f31c6606cc..6fc0ccc029fc9d1f11f4325792977a67fa89a6c9 100644
+index a0d1e9f7535db896c0589dc02cb03bda23086167..0156e97e736998ed63200d73f4244846050d8354 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -966,7 +966,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
--- a/Spigot-Server-Patches/0240-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0240-add-more-information-to-Entity.toString.patch
@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ef3fb476615fe6a3aafdf5aebcf5680bfaa62e49..07941c987a0c644e896f49ce217c1c625dc25014 100644
+index f647b4975e714164313142acef04f8e320ca79cf..18ec6f553ddea775b279658a280fc2a3e5f96fa9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2437,7 +2437,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 Add -Ddebug.entities=true to your JVM flags to gain more information

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 07941c987a0c644e896f49ce217c1c625dc25014..c863fd94ee77b81aec84223588e20eed974515d6 100644
+index 18ec6f553ddea775b279658a280fc2a3e5f96fa9..be5ad564964f26c90440bb30464edbf9882ff1e1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -76,6 +76,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -40,7 +40,7 @@ index 8862bbd73b627e37709d46e6aeeee70c89cbd821..4bbcd00950405a4bf3ce391b557049a3
 
     protected void g() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 54d7d0da6ee998319db2454372ca283a9d571cdb..fa095bb55c09a3b5f8ab70bcce5a03c7eb93dcfa 100644
+index d3c282eb5253351ec4288bffaeca715547089cec..cb1330ef117224aea07208cebff544c714ae313a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -68,6 +68,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -52,7 +52,7 @@ index 54d7d0da6ee998319db2454372ca283a9d571cdb..fa095bb55c09a3b5f8ab70bcce5a03c7
     public boolean captureBlockStates = false;
     public boolean captureTreeGeneration = false;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6fc0ccc029fc9d1f11f4325792977a67fa89a6c9..47c49389d5f025003a0a9876cab5eb67cabec145 100644
+index 0156e97e736998ed63200d73f4244846050d8354..041dfa08066667501f18e043e8b894c660b949a7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -88,6 +88,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {
--- a/Spigot-Server-Patches/0247-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0247-Vanished-players-don-t-have-rights.patch
@ -17,7 +17,7 @@ index e0ae51ede44de5c894df526c1fc6d94c46d72013..8bcca73ae48ee822d32a6d23be2e1056
             return this.getBlock().c(this.p(), iblockaccess, blockposition, voxelshapecollision);
         }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 64a739d0660098b840e2369f150670691eb9c441..91b450da31b972e2251382cd068a818a6bd70c1e 100644
+index be5ad564964f26c90440bb30464edbf9882ff1e1..c7c8dd944c084c281568cb6444c8bda35b35a4df 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/0251-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0251-Prevent-Saving-Bad-entities-to-chunks.patch
@ -80,7 +80,7 @@ index d30c4d5a4ee83e21ba9269c0b92af2b72b85d3cc..3a292bccb2295bf7ae46fc3d7e5c9c63
     public static ChunkStatus.Type a(@Nullable NBTTagCompound nbttagcompound) {
         if (nbttagcompound != null) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 47c49389d5f025003a0a9876cab5eb67cabec145..0d78071a1d91c0289992d84a3858102e56434356 100644
+index 041dfa08066667501f18e043e8b894c660b949a7..d6c319c1177e43eebeb7d9f366da3495b38b6b97 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1046,6 +1046,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
--- a/Spigot-Server-Patches/0254-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0254-Implement-Expanded-ArmorStand-API.patch
@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions

 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 89f6525ef1a4c41d3b662a5ad22b353064a82f36..8922c656617bd8aed5b68f671d5191a537695bdf 100644
+index 9a3183e55fcb6809d2b324ad52e27f3e77d8fcb2..abcf3ab8bab2ca98ab0f7e852b8185e27949a210 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -395,6 +395,7 @@ public class EntityArmorStand extends EntityLiving {
--- a/Spigot-Server-Patches/0258-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0258-Add-hand-to-bucket-events.patch
@ -95,10 +95,10 @@ index 26669ded3ec47d13e4e79d65d0f05a588f9e1f63..d6bce67fff263d2c04be29020a8dc66f
     public boolean s_() {
         return this.isClientSide;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 1cbb1c3ddf45cd6d650ca274af4545f2d1c8a813..f047f07e768b77feb469c69166f36a3f6779f561 100644
+index e26b1362899a9fad5e0e3a4e49acd98b67a4f03b..f9d2228fb0543c60d2e0848afb4f927b6a7bce51 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1536,15 +1536,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1547,15 +1547,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {
         this.getMinecraftServer().getPlayerList().sendAll(new PacketPlayOutSpawnPosition(blockposition, f));
     }
 
--- a/Spigot-Server-Patches/0260-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0260-Fix-client-rendering-skulls-from-same-user.patch
@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user,
 for when different skins were used when skull was made.

 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 1a28e6f20340920c35bcd87a0dbfdcd745c79706..64e9d50be03cbefa521bf8c2e6dba5ceadda78b6 100644
+index bdb6f9bf3477f85859e3f0dd761e2e895f1a8e2b..22568201a292edc8e25396e55cad1572d419b775 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -60,7 +60,7 @@ public final class ItemStack {
--- a/Spigot-Server-Patches/0263-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0263-Use-ConcurrentHashMap-in-JsonList.patch
@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp
 Finally, added a couple obfhelpers for the modified code

 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 5b01e4edb3c0f8bc785b70128cbe31b14356e4fb..9213bfb78e92b838189161045e3945588251b486 100644
+index da21918ce0339a0eb8f65ce7791a04ceb12749b7..1fc0139cb9694ddea41f57d95774c3b47e8530c5 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
@@ -12,6 +12,8 @@ import java.io.BufferedReader;
--- a/Spigot-Server-Patches/0268-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0268-Restore-vanlla-default-mob-spawn-range.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Restore vanlla default mob-spawn-range


 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 5c394d26e2d2dbc5d65e38c1273b7e5d02464f3a..f0ad5fa235adfd165b8e56be7352568a3b3ae54a 100644
+index 0efcbab8f8806aeb8dd8bd6384e5a7cee375d100..34ee684901906fc2ef5f0d09680d2686b813e52b 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -165,7 +165,7 @@ public class SpigotWorldConfig
--- a/Spigot-Server-Patches/0276-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0276-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fd314d9d530c347f9f78e81763a9a079b44aa751..d193667beca3da156d8ae17cd80f4bf4c1dbfc8c 100644
+index 47d407af1a770404284c591978978b229cbf7541..bc10ccd76fcf3f03c23f52064c4db17bcad1c574 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -507,7 +507,7 @@ public class CraftWorld implements World {
--- a/Spigot-Server-Patches/0279-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0279-Improve-death-events.patch
@ -27,7 +27,7 @@ index 0790d45e3c8ac68c280b9378d93061b48b045639..a8054a599e3eb502e7bbce903b568398
         int i = this.f ? 300 : 100;
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 769fada8ffa657493e5d7bf025281ff5f9f4299f..c9f4dab524e8f2a80b9e3ee178c36b2e394b5f84 100644
+index 49c7b40744adcd36e5ae1eef026679e9b646feac..9b55635d97f8ad90f13fdf609471c1f73eb40aed 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1452,6 +1452,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/0280-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0280-Allow-chests-to-be-placed-with-NBT-data.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Allow chests to be placed with NBT data


 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 64e9d50be03cbefa521bf8c2e6dba5ceadda78b6..63aa474c73f506737cb5de31977bffcd17d4dc11 100644
+index 22568201a292edc8e25396e55cad1572d419b775..7ad595d5d7e090c523aa45a10d0f84b609ea86df 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -244,6 +244,7 @@ public final class ItemStack {
--- a/Spigot-Server-Patches/0303-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0303-Reset-players-airTicks-on-respawn.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c9f4dab524e8f2a80b9e3ee178c36b2e394b5f84..9b8d17aa68bad1a4916681b9eed121011bf3380c 100644
+index 9b55635d97f8ad90f13fdf609471c1f73eb40aed..00d783a7fd27fb46f5bbca4055be1530efd71534 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2264,6 +2264,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
--- a/Spigot-Server-Patches/0305-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/Spigot-Server-Patches/0305-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@ -12,7 +12,7 @@ server threads
 Allow usage of a single thread executor by not using ForkJoin so single core CPU's.

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index aea9e169f9a11378c176c0cc3ee5a0d59e6a4c38..354109e5f7a8e1b0895e12002951a4bd3bf7dd0c 100644
+index d6d93c76f047573b3e7ea91409fb85e093666812..f1008096ee90b506c322fd1667c6b60faefd545c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -175,6 +175,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
--- a/Show More
+++ b/Show More