diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch
index c581854b54..24036d368f 100644
--- a/Spigot-API-Patches/0004-Timings-v2.patch
+++ b/Spigot-API-Patches/0004-Timings-v2.patch
@@ -3375,18 +3375,21 @@ index 2a145d851ce30360aa39549745bd87590c034584..00000000000000000000000000000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0859d2bc226c4abf21ac1dc28f35ebe805046d89..39d196992bbcc263fa4bcd46c6187ba7b8adb935 100644
+index 40345617fd387afe6d2ec7ff7043b3a3538f19f7..f22b21ee12496452f7b2125c131f56ecc74d439a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1369,6 +1369,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-         public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
+@@ -1391,7 +1391,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+          */
+         public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
-         }
 +
-+        public int getPing()
-+        {
-+            throw new UnsupportedOperationException( "Not supported yet." );
 +        }
++
++        // Paper start
++        public int getPing() {
++            throw new UnsupportedOperationException( "Not supported yet." );
+         }
++        // Paper end
      }
  
      @NotNull
diff --git a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch
index b36f2c83e3..3bd860ebe0 100644
--- a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch
+++ b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 39d196992bbcc263fa4bcd46c6187ba7b8adb935..4f3a2189b42a2909f152ed1e33f79f431c6b903c 100644
+index f22b21ee12496452f7b2125c131f56ecc74d439a..ab1a2816e3bc78be103823fd61cc5d01f8362552 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1271,6 +1271,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1272,6 +1272,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @NotNull
      public String getLocale();
  
diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
index df389fb6f7..79300637cf 100644
--- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
+++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4f3a2189b42a2909f152ed1e33f79f431c6b903c..babf70ad97413112f57ae1380f09a74e51975ff5 100644
+index ab1a2816e3bc78be103823fd61cc5d01f8362552..ff46ea6aa545c910acaa7e5a7690e88e0129608c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1285,6 +1285,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1286,6 +1286,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param affects Whether the player can affect mob spawning
       */
      public void setAffectsSpawning(boolean affects);
diff --git 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
index 444a100971..ff1f7afbcf 100644
--- 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,10 +68,10 @@ index 620a16eaa74a31711b8598a70c9e9ed0f361ceb8..2387c04e8a4d14f04e7e4d09f7120d48
       * 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 babf70ad97413112f57ae1380f09a74e51975ff5..296aca8a5da6aa2a61988c9915df4d95279815a5 100644
+index ff46ea6aa545c910acaa7e5a7690e88e0129608c..695d80d8aabdbb4a6553d5446a8f7ea766b52472 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -481,6 +481,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -482,6 +482,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  
diff --git a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
index 933dad54bb..e660d3c914 100644
--- a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
@@ -384,18 +384,18 @@ index 0000000000000000000000000000000000000000..4fe18540f77143ee7cd7e94d3aa279ae
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 296aca8a5da6aa2a61988c9915df4d95279815a5..eab4e326392efa93dd9acd086755a97616c79c39 100644
+index 695d80d8aabdbb4a6553d5446a8f7ea766b52472..c12087cd9551ad254867c428139bdf38b5c7770c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1,6 +1,7 @@
- package org.bukkit.entity;
+@@ -2,6 +2,7 @@ package org.bukkit.entity;
  
  import java.net.InetSocketAddress;
+ import java.util.UUID;
 +import com.destroystokyo.paper.Title; // Paper
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -511,6 +512,116 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -512,6 +513,116 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
diff --git a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
index 4c2e4087a3..f1a7bd1c68 100644
--- a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
 
 
 diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
-index fe6b162fe55cddf3f9be40fa4cd42e5060ac85ad..cab682f741da6bbf7463b457ce1674accce6f5f2 100644
+index ac772bf349e0ffe9cab1df165d9460b387f2fe69..de4370233e0358da30d3704145044a99d8369f52 100644
 --- a/src/main/java/org/bukkit/command/CommandSender.java
 +++ b/src/main/java/org/bukkit/command/CommandSender.java
-@@ -79,4 +79,30 @@ public interface CommandSender extends Permissible {
+@@ -99,4 +99,30 @@ public interface CommandSender extends Permissible {
      @NotNull
      Spigot spigot();
      // Spigot end
diff --git a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
index 691aac64f4..7277109e19 100644
--- a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index eab4e326392efa93dd9acd086755a97616c79c39..bc9ff9b4a475d8b108b54f2d4a99199379b1c63d 100644
+index c12087cd9551ad254867c428139bdf38b5c7770c..e8fd982380cc55a2a5ff3cb4aea0b2f25857aa49 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1021,7 +1021,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1022,7 +1022,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long. The
       *     length restriction is an implementation specific arbitrary value.
@@ -18,7 +18,7 @@ index eab4e326392efa93dd9acd086755a97616c79c39..bc9ff9b4a475d8b108b54f2d4a991993
      public void setResourcePack(@NotNull String url);
  
      /**
-@@ -1459,6 +1461,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1460,6 +1462,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void openBook(@NotNull ItemStack book);
  
diff --git a/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
index af42b759c7..fe0cbb2873 100644
--- a/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bc9ff9b4a475d8b108b54f2d4a99199379b1c63d..7ac87a8d177f7715204ed4ebbc9a1ef3cffe07df 100644
+index e8fd982380cc55a2a5ff3cb4aea0b2f25857aa49..742c7b5a1919e2c3a70891d6c34756076c386368 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -483,6 +483,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -484,6 +484,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
@@ -42,7 +42,7 @@ index bc9ff9b4a475d8b108b54f2d4a99199379b1c63d..7ac87a8d177f7715204ed4ebbc9a1ef3
      /**
       * Sends the component to the player
       *
-@@ -506,9 +533,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -507,9 +534,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Sends an array of components as a single message to the specified screen position of this player
       *
@@ -54,7 +54,7 @@ index bc9ff9b4a475d8b108b54f2d4a99199379b1c63d..7ac87a8d177f7715204ed4ebbc9a1ef3
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
-@@ -1584,9 +1613,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1585,9 +1614,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends the component to the specified screen position of this player
           *
@@ -66,7 +66,7 @@ index bc9ff9b4a475d8b108b54f2d4a99199379b1c63d..7ac87a8d177f7715204ed4ebbc9a1ef3
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1594,9 +1625,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1595,9 +1626,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends an array of components as a single message to the specified screen position of this player
           *
diff --git a/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
index 97ab9eac1d..0a55035687 100644
--- a/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch
@@ -86,10 +86,10 @@ index c2096b5344d48d855d031538ec32e0154bd9054d..bca9d3659f6fceeca4b7fecbc7034d6f
      <T> void setParticle(@NotNull Particle particle, @Nullable T data);
  
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7ac87a8d177f7715204ed4ebbc9a1ef3cffe07df..d3347e073cdc481f90de8076c5ee3986a4ae77aa 100644
+index 742c7b5a1919e2c3a70891d6c34756076c386368..7e90c11066a7882a8ea4dfa757323616fb88e612 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -498,7 +498,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -499,7 +499,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * Use supplied alternative character to the section symbol to represent legacy color codes.
       *
@@ -98,7 +98,7 @@ index 7ac87a8d177f7715204ed4ebbc9a1ef3cffe07df..d3347e073cdc481f90de8076c5ee3986
       * @param message The message to send
       */
      public void sendActionBar(char alternateChar, @NotNull String message);
-@@ -572,6 +572,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -573,6 +573,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Update the subtitle of titles displayed to the player
       *
@@ -106,7 +106,7 @@ index 7ac87a8d177f7715204ed4ebbc9a1ef3cffe07df..d3347e073cdc481f90de8076c5ee3986
       * @deprecated Use {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -580,6 +581,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -581,6 +582,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Update the subtitle of titles displayed to the player
       *
@@ -114,7 +114,7 @@ index 7ac87a8d177f7715204ed4ebbc9a1ef3cffe07df..d3347e073cdc481f90de8076c5ee3986
       * @deprecated Use {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -588,6 +590,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -589,6 +591,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Show the given title to the player, along with the last subtitle set, using the last set times
       *
@@ -122,7 +122,7 @@ index 7ac87a8d177f7715204ed4ebbc9a1ef3cffe07df..d3347e073cdc481f90de8076c5ee3986
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -596,6 +599,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -597,6 +600,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Show the given title to the player, along with the last subtitle set, using the last set times
       *
@@ -130,7 +130,7 @@ index 7ac87a8d177f7715204ed4ebbc9a1ef3cffe07df..d3347e073cdc481f90de8076c5ee3986
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -1245,6 +1249,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1246,6 +1250,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -138,7 +138,7 @@ index 7ac87a8d177f7715204ed4ebbc9a1ef3cffe07df..d3347e073cdc481f90de8076c5ee3986
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
  
-@@ -1261,6 +1266,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1262,6 +1267,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -146,7 +146,7 @@ index 7ac87a8d177f7715204ed4ebbc9a1ef3cffe07df..d3347e073cdc481f90de8076c5ee3986
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
  
-@@ -1311,6 +1317,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1312,6 +1318,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -154,7 +154,7 @@ index 7ac87a8d177f7715204ed4ebbc9a1ef3cffe07df..d3347e073cdc481f90de8076c5ee3986
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1331,6 +1338,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1332,6 +1339,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -162,7 +162,7 @@ index 7ac87a8d177f7715204ed4ebbc9a1ef3cffe07df..d3347e073cdc481f90de8076c5ee3986
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1387,6 +1395,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1388,6 +1396,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -170,7 +170,7 @@ index 7ac87a8d177f7715204ed4ebbc9a1ef3cffe07df..d3347e073cdc481f90de8076c5ee3986
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
-@@ -1409,6 +1418,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1410,6 +1419,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
diff --git 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
index aee2cb7eb8..4f01eb8db8 100644
--- 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,10 +57,10 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d3347e073cdc481f90de8076c5ee3986a4ae77aa..54a8965dd4b986657a57c7d150c4314a4acee68e 100644
+index 7e90c11066a7882a8ea4dfa757323616fb88e612..a0b9f03cba3ddd3708b898df8f405c8595c18775 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a player, connected or not
   */
diff --git 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
index b346e8109e..5478a14646 100644
--- 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,10 +10,10 @@ 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 54a8965dd4b986657a57c7d150c4314a4acee68e..dbe0ccfe2f00bc7b430c63f6384e4569b1fede2f 100644
+index a0b9f03cba3ddd3708b898df8f405c8595c18775..a489718adee9eb78a02d0a75198c4ec7af844a99 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -737,12 +737,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -738,12 +738,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void resetPlayerWeather();
  
diff --git a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
index 238d11bad6..6ba1b418d2 100644
--- a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
@@ -6,18 +6,18 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index dbe0ccfe2f00bc7b430c63f6384e4569b1fede2f..b7abe54c824662ff6f7e3928850e4c43d9edfafc 100644
+index a489718adee9eb78a02d0a75198c4ec7af844a99..58a1e24f15043b21a1a99931cde628990a66831f 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;
- 
+@@ -3,6 +3,7 @@ package org.bukkit.entity;
  import java.net.InetSocketAddress;
+ import java.util.UUID;
  import com.destroystokyo.paper.Title; // Paper
 +import com.destroystokyo.paper.profile.PlayerProfile; // Paper
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -1575,6 +1576,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1576,6 +1577,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
       */
      boolean hasResourcePack();
diff --git a/Spigot-API-Patches/0091-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0091-Add-Ban-Methods-to-Player-Objects.patch
index 4f2dd23f37..93f9df3a86 100644
--- 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,11 +74,11 @@ 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 b7abe54c824662ff6f7e3928850e4c43d9edfafc..d15d659ad9c721137e8692ac6c5981dd9ddb1e70 100644
+index 58a1e24f15043b21a1a99931cde628990a66831f..e471728b2ab69c5f8568896030e4866c5bf258a1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3,6 +3,10 @@ package org.bukkit.entity;
- import java.net.InetSocketAddress;
+@@ -4,6 +4,10 @@ import java.net.InetSocketAddress;
+ import java.util.UUID;
  import com.destroystokyo.paper.Title; // Paper
  import com.destroystokyo.paper.profile.PlayerProfile; // Paper
 +import java.util.Date; // Paper
@@ -88,7 +88,7 @@ index b7abe54c824662ff6f7e3928850e4c43d9edfafc..d15d659ad9c721137e8692ac6c5981dd
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -484,6 +488,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -485,6 +489,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
diff --git a/Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch
index 74292af8c5..41e015686f 100644
--- a/Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d15d659ad9c721137e8692ac6c5981dd9ddb1e70..47556ebc99c552ac9508a37474f37fdda7185d56 100644
+index e471728b2ab69c5f8568896030e4866c5bf258a1..59d39692abb48c23f1f832202bedda00815b0d6d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1750,6 +1750,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1751,6 +1751,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param profile The new profile to use
       */
      void setPlayerProfile(@NotNull PlayerProfile profile);
diff --git a/Spigot-API-Patches/0194-Add-Player-Client-Options-API.patch b/Spigot-API-Patches/0194-Add-Player-Client-Options-API.patch
index a448e6fbf5..8b99b5d3a0 100644
--- a/Spigot-API-Patches/0194-Add-Player-Client-Options-API.patch
+++ b/Spigot-API-Patches/0194-Add-Player-Client-Options-API.patch
@@ -176,18 +176,18 @@ index 0000000000000000000000000000000000000000..f7f171c4ee0b8339b2f8fbe82442d65f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 47556ebc99c552ac9508a37474f37fdda7185d56..b584f8b15f7ee36b42bba0e0bae721aae8f6f14b 100644
+index 59d39692abb48c23f1f832202bedda00815b0d6d..fbb5ca4defd516bbcc888e8cf163154657314732 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1,6 +1,7 @@
- package org.bukkit.entity;
+@@ -2,6 +2,7 @@ package org.bukkit.entity;
  
  import java.net.InetSocketAddress;
+ import java.util.UUID;
 +import com.destroystokyo.paper.ClientOption; // Paper
  import com.destroystokyo.paper.Title; // Paper
  import com.destroystokyo.paper.profile.PlayerProfile; // Paper
  import java.util.Date; // Paper
-@@ -1770,6 +1771,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1771,6 +1772,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the cooldown counter to 0, effectively starting the cooldown period.
       */
      void resetCooldown();
diff --git a/Spigot-API-Patches/0221-Brand-support.patch b/Spigot-API-Patches/0221-Brand-support.patch
index bb501f24a8..960eab7664 100644
--- a/Spigot-API-Patches/0221-Brand-support.patch
+++ b/Spigot-API-Patches/0221-Brand-support.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b584f8b15f7ee36b42bba0e0bae721aae8f6f14b..991f757a89d2e917186bb152a2f92bad8b6c2897 100644
+index fbb5ca4defd516bbcc888e8cf163154657314732..bd294d776216d98899ed58fae739df2405a735e6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1873,6 +1873,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-         }
+@@ -1898,6 +1898,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+         // Paper end
      }
  
 +    // Paper start - brand support
diff --git a/Spigot-API-Patches/0230-Player-elytra-boost-API.patch b/Spigot-API-Patches/0230-Player-elytra-boost-API.patch
index b44c5f589f..bf2a74799d 100644
--- a/Spigot-API-Patches/0230-Player-elytra-boost-API.patch
+++ b/Spigot-API-Patches/0230-Player-elytra-boost-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 991f757a89d2e917186bb152a2f92bad8b6c2897..16bdb4b717368d121e84121f85bbf3de5fb642f1 100644
+index bd294d776216d98899ed58fae739df2405a735e6..a23c08c48ec627147d94ab4bf4fdf4dae1edeaca 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1777,6 +1777,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1778,6 +1778,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      @NotNull
      <T> T getClientOption(@NotNull ClientOption<T> option);
diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
index 6d4cc11082..627335e543 100644
--- a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
+++ b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
@@ -80,7 +80,7 @@ index 157eccc8e45566db527c7d46d3b3d235c802c8f7..e46ed143a52eab4af15cc76606992c3b
      }
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8cd7c8d5d1a20239ffb3b064f8bd0b7a45cfc63f..cd7866f2251f68f24801eacc55800907f184537f 100644
+index f6b97eec33ace01077e6bca58f3c11978422ac47..5e0db989a0f6c7c7041a968550f4068b9a946136 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -176,7 +176,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -137,10 +137,10 @@ index b8f0653e3e82824a62dfe64348a33ab6432b4e17..b9ffd000c97111678d45fd55dc9c207e
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index e753eb4c5edc466a1948cd575ccf827dd3c9bd9e..b1804d274e95d2e51018acd1159a9dfa1573d3be 100644
+index 8c1a66b921c6a63a5446efa24f2e2115010cae41..c20f161eb42159edcfe2c47e3749d88fba9b4747 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -144,6 +144,7 @@ import net.minecraft.server.EntityZombieVillager;
+@@ -145,6 +145,7 @@ import net.minecraft.server.EntityZombieVillager;
  import net.minecraft.server.IChatBaseComponent;
  import net.minecraft.server.NBTBase;
  import net.minecraft.server.NBTTagCompound;
@@ -148,7 +148,7 @@ index e753eb4c5edc466a1948cd575ccf827dd3c9bd9e..b1804d274e95d2e51018acd1159a9dfa
  import org.bukkit.EntityEffect;
  import org.bukkit.Location;
  import org.bukkit.Server;
-@@ -185,6 +186,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -186,6 +187,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          this.entity = entity;
      }
  
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index fcd924233d..6aeeb3bd24 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1459,7 +1459,7 @@ index 127c03c321e1414e0d174c8d81a7851c9da03574..d98b6ef44e1836920956754dfcb6654f
  
      protected void broadcast(Entity entity, Packet<?> packet) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3dff395d4e1dc3907f9cf1d35cbc4e7b5bbd8652..20651905fd6566e856aeb7340469047b7eb8c2c8 100644
+index afaa28520709bbed1fe37f79ebdf33cc0bf883a2..c9cc39a71eca13e9dcb9284cfd4419794bf9f18f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -64,6 +64,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -2012,10 +2012,10 @@ index 7f435847ac1d13756ce233e7d5ae13f9dc17c443..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 68da8e3981dda2c04031d8033776abb845dc109e..4f8745ce03eef96597963f5c2e08055f51686755 100644
+index a225e85c5ab04bac0249ae72d24094b10c72be81..f427185c84fe4c6cf5a0af89d030df9f3f9bfd74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1797,6 +1797,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1811,6 +1811,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
index ef601604ea..b77ad82373 100644
--- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
@@ -117,10 +117,10 @@ index 11497c73f40b0c681585cf6efca99a63eeb62e76..37c4b75f4dcb490e2430828977135830
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b1804d274e95d2e51018acd1159a9dfa1573d3be..37f7ab8cb46312ce4a7fb53f3b394c1a6c478126 100644
+index c20f161eb42159edcfe2c47e3749d88fba9b4747..2896dae1093e148f776905bf18ddb5b73deec326 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1033,4 +1033,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1044,4 +1044,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return spigot;
      }
      // Spigot end
diff --git a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch
index 221d4fbf70..722af167e0 100644
--- a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch
@@ -17,10 +17,10 @@ index b5e1ae8efb7165547e228d2c9d6d84a72b772df5..fb18d519961f5130e7b6907d24305b35
      static {
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 37f7ab8cb46312ce4a7fb53f3b394c1a6c478126..b8aa6056c88c8fe2661318d799694d0cc3792e64 100644
+index 2896dae1093e148f776905bf18ddb5b73deec326..0bce938a1db4ea11d4ed647530d6c44ec9dbe975 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -423,10 +423,41 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -424,10 +424,41 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public void setVelocity(Vector velocity) {
          Preconditions.checkArgument(velocity != null, "velocity");
          velocity.checkFinite();
diff --git a/Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch
index ac875dc14f..c77b785bdb 100644
--- a/Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch
@@ -49,10 +49,10 @@ index 259713339217660e8b81a9500f57c6995ea59dde..8eb20c6b9a88d5d4056f91df1f496d3d
                              if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) {
                                  Entity vehicle = entity.getVehicle();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b8aa6056c88c8fe2661318d799694d0cc3792e64..7dccddf91d2f6a8c422a378db6a0c9fc836ec9f2 100644
+index 0bce938a1db4ea11d4ed647530d6c44ec9dbe975..a7d8b2e4a60818f9bfdc42fb1277f7860c6bda2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1071,5 +1071,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1082,5 +1082,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          Location origin = getHandle().origin;
          return origin == null ? null : origin.clone();
      }
diff --git a/Spigot-Server-Patches/0222-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0222-Fix-CraftEntity-hashCode.patch
index e9acb081b7..47ac25dc03 100644
--- a/Spigot-Server-Patches/0222-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0222-Fix-CraftEntity-hashCode.patch
@@ -21,10 +21,10 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 7dccddf91d2f6a8c422a378db6a0c9fc836ec9f2..a22c576ea6cc4115d53e51d710bd7ce55487dc65 100644
+index a7d8b2e4a60818f9bfdc42fb1277f7860c6bda2a..fbceb6fde3dc33f3980bb26b8a8bb0bff0263c24 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -739,14 +739,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -740,14 +740,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
              return false;
          }
          final CraftEntity other = (CraftEntity) obj;
diff --git a/Spigot-Server-Patches/0337-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0337-Entity-getEntitySpawnReason.patch
index bb1882ca97..6676e55ea0 100644
--- a/Spigot-Server-Patches/0337-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0337-Entity-getEntitySpawnReason.patch
@@ -96,10 +96,10 @@ index 458ee180fa1c8c105d596125398b2c34d8265d0a..14e338184592cf5f171e6a95f07c8374
          if (entity.valid) {
              MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a22c576ea6cc4115d53e51d710bd7ce55487dc65..22ac5f2bf0f2e4214855f3b1eb259a67b4c60776 100644
+index fbceb6fde3dc33f3980bb26b8a8bb0bff0263c24..43e9181ea50b1db2fae4645d702e64b3d2157113 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1077,5 +1077,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1088,5 +1088,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean fromMobSpawner() {
          return getHandle().spawnedViaMobSpawner;
      }
diff --git a/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch
index 97fedef6e4..bc18fa4c5d 100644
--- a/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch
+++ b/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch
@@ -3505,7 +3505,7 @@ index 8e79200b23f2dee612b0cbdcd6359a25dc2323cb..e7d9674e25c06090d57bba6c8229bc3b
          return this.m;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ec3089d49fe85295bddbb2960eaef788a2ae7805..dabeeb95011225963d26fead2a58b0cb3c3f91fc 100644
+index f0fd7ff6afb1522a41b3dc9f68b46c2f4f046eac..ce444b2ad1169f6b2607389d99b5a084420bb704 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -582,6 +582,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -4094,10 +4094,10 @@ index e741d1f966869b057652a93a1ef1785ad152f303..204ad44454732345be78c5c428dfb178
      // Spigot start
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 22ac5f2bf0f2e4214855f3b1eb259a67b4c60776..f36c85802dc2d6260058b2a77f225f32624775cb 100644
+index 43e9181ea50b1db2fae4645d702e64b3d2157113..fdefdef19c5330d022a27ab626d18a8566f37899 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -502,6 +502,28 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -503,6 +503,28 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          entity.setHeadRotation(yaw);
      }
  
diff --git a/Spigot-Server-Patches/0522-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0522-Add-entity-liquid-API.patch
index a4d2abb259..f5429e47c6 100644
--- a/Spigot-Server-Patches/0522-Add-entity-liquid-API.patch
+++ b/Spigot-Server-Patches/0522-Add-entity-liquid-API.patch
@@ -40,10 +40,10 @@ index 422b82f15c323f504458a1fdcd5cf7018ab53468..6aeea48d4cf4732f6a5a5dba12af873c
          return !this.justCreated && this.M.getDouble(TagsFluid.LAVA) > 0.0D;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index f36c85802dc2d6260058b2a77f225f32624775cb..eae7509b5b072cba86015aad1e878aa752fc7b33 100644
+index fdefdef19c5330d022a27ab626d18a8566f37899..2ca79b3e9b3418a2a8dd8ee9e3fb9d41aec1e43c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1104,5 +1104,33 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1115,5 +1115,33 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason() {
          return getHandle().spawnReason;
      }
diff --git a/Spigot-Server-Patches/0549-Brand-support.patch b/Spigot-Server-Patches/0549-Brand-support.patch
index 56a2df5fd7..41b563f963 100644
--- a/Spigot-Server-Patches/0549-Brand-support.patch
+++ b/Spigot-Server-Patches/0549-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1f919dde69c8d8db0b0a7e857e5f10878f3aac52..4606837f94fc5dced95dc08fbafa3b578404e81d 100644
+index 3dc5b0279f4c50138e7f85b8aff182b6ed2e2c61..f6c04946aa752b9db4e0c81dbb74334618c955ad 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -5,6 +5,7 @@ import com.google.common.primitives.Doubles;
@@ -65,10 +65,10 @@ index 1f919dde69c8d8db0b0a7e857e5f10878f3aac52..4606837f94fc5dced95dc08fbafa3b57
          return (!this.player.joining && !this.networkManager.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 453cae339656a52a6d42bc712de546b340a5e91c..bdfd9f84209dec8ee312f72075c9e71c30cbbdec 100644
+index 9141f1c214944672899a64bd760f7db0c53a8e94..d40ff328c4c29038c43a5e66f788a11515abb8e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2166,6 +2166,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2180,6 +2180,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      };
  
diff --git a/Spigot-Server-Patches/0559-Brand-support.patch b/Spigot-Server-Patches/0559-Brand-support.patch
index 120781781e..e8a842c71c 100644
--- a/Spigot-Server-Patches/0559-Brand-support.patch
+++ b/Spigot-Server-Patches/0559-Brand-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bdfd9f84209dec8ee312f72075c9e71c30cbbdec..fb1852ea6bf6997771a3522079bf3a32ebca357c 100644
+index d40ff328c4c29038c43a5e66f788a11515abb8e2..eb928f66d9ba8f4bd58bc683353f675b3774eb0f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2169,7 +2169,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2183,7 +2183,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper start - brand support
      @Override
      public String getClientBrandName() {
diff --git a/Spigot-Server-Patches/0571-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0571-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 3dbbcb1a7a..bf3e7725d5 100644
--- a/Spigot-Server-Patches/0571-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/Spigot-Server-Patches/0571-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -35,7 +35,7 @@ index 6aeea48d4cf4732f6a5a5dba12af873c2aee493b..fa0256a99c833e6035b8d3e873a93af2
          this.yaw = f;
          this.pitch = f1;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4606837f94fc5dced95dc08fbafa3b578404e81d..bb429358c558171134ba2aa188722f69f15858c8 100644
+index f6c04946aa752b9db4e0c81dbb74334618c955ad..6e68b91bf8e36e12dfadab5b1bccdc2b7dd94fbf 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -544,7 +544,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -57,10 +57,10 @@ index 4606837f94fc5dced95dc08fbafa3b578404e81d..bb429358c558171134ba2aa188722f69
          this.player.playerConnection.sendPacket(new PacketPlayOutPosition(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.teleportAwait));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index eae7509b5b072cba86015aad1e878aa752fc7b33..e19db32edc5124a86e8123dcc13be9f5a439ee74 100644
+index 2ca79b3e9b3418a2a8dd8ee9e3fb9d41aec1e43c..f1243b308e44d7c08e007d8ce080c2fc6248753c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -548,7 +548,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -549,7 +549,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          }
  
          // entity.setLocation() throws no event, and so cannot be cancelled
diff --git a/Spigot-Server-Patches/0578-Entity-isTicking.patch b/Spigot-Server-Patches/0578-Entity-isTicking.patch
index 0fa0daec57..39e56c933d 100644
--- a/Spigot-Server-Patches/0578-Entity-isTicking.patch
+++ b/Spigot-Server-Patches/0578-Entity-isTicking.patch
@@ -19,10 +19,10 @@ index 53fb4f04087c091f3354e74d6b94554601f2cbe0..d86b67a63b37569fc4ca69ec04305a33
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index e19db32edc5124a86e8123dcc13be9f5a439ee74..f7d751348ca358a80bafc7f92c635eac316bc4cb 100644
+index f1243b308e44d7c08e007d8ce080c2fc6248753c..4ec0e9220d2fa976dc6dfecd3eedb5b78a0ef8f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1132,5 +1132,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1143,5 +1143,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean isInLava() {
          return getHandle().isInLava();
      }
diff --git a/work/Bukkit b/work/Bukkit
index 308851669a..eda400d3d7 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 308851669a4b264468e83cfb75215bff3638b2c0
+Subproject commit eda400d3d7f661c78c6128131d76f22f1dc113f5
diff --git a/work/Spigot b/work/Spigot
index f011ca24f2..aa477927d3 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit f011ca24f2b53e0fb0e7a1cfa7afd5336a85beec
+Subproject commit aa477927d347496adbacfea2617fe244ee1fb47b