[Auto] Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
a05df28a7 SPIGOT-6122: Revert "SPIGOT-5794: Do not skip PlayerInteractEvent"

Spigot-Server-Patches/0009-Timings-v2.patch

@@ -1409,7 +1409,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 81a99c156c7f626964c3e93491d8bd1d6647e960..46a4fc3140cd805794dfbc8456a7cb98c0004752 100644
+index c7a7e2cf54b4ca7fd65fca63c0f102f479a0f3e5..89c36a5ad2a74a2bf4c86ad108a43e97fa88e793 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1436,7 +1436,7 @@ index 81a99c156c7f626964c3e93491d8bd1d6647e960..46a4fc3140cd805794dfbc8456a7cb98
  
      }
  
-@@ -1673,7 +1672,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1678,7 +1677,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -1445,7 +1445,7 @@ index 81a99c156c7f626964c3e93491d8bd1d6647e960..46a4fc3140cd805794dfbc8456a7cb98
          // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1684,7 +1683,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1689,7 +1688,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -1454,7 +1454,7 @@ index 81a99c156c7f626964c3e93491d8bd1d6647e960..46a4fc3140cd805794dfbc8456a7cb98
              return;
          }
  
-@@ -1697,7 +1696,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1702,7 +1701,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
              return;
          } finally {

Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch

@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 46a4fc3140cd805794dfbc8456a7cb98c0004752..051e8471e4a55c444cbe5e7274ce878af7a15c61 100644
+index 89c36a5ad2a74a2bf4c86ad108a43e97fa88e793..090bce8c24e08c0af6f71d64568514f2c9675aa5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1604,6 +1604,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1609,6 +1609,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
  
          if (!async && s.startsWith("/")) {

Spigot-Server-Patches/0058-Complete-resource-pack-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 051e8471e4a55c444cbe5e7274ce878af7a15c61..601dfa3fba8226c981444db12c868d6e68863ade 100644
+index 090bce8c24e08c0af6f71d64568514f2c9675aa5..c3f2575fb40e82ee4b70301b7655698388b6ae05 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1370,7 +1370,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1375,7 +1375,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());

Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch

@@ -18,10 +18,10 @@ index 49c911e54eb3b20d820f3e1895c057eead6d312b..09c757a3bb1d9a49343cf58e18f736e1
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 601dfa3fba8226c981444db12c868d6e68863ade..7f06b13f65c97d29119a2158db806114a66b3452 100644
+index c3f2575fb40e82ee4b70301b7655698388b6ae05..28febcc22bc931e4e89f274275853ceaeab9ce0a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1945,6 +1945,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1950,6 +1950,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  }
              }
          }

Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch

@@ -26,10 +26,10 @@ index fe2c8001897dc6d66ce0d24ddb1a5d3b79810294..538e6751f3bda77ba32256158d2a6a25
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7f06b13f65c97d29119a2158db806114a66b3452..efbde5d484b26bef10773cc8941b040624618db9 100644
+index 28febcc22bc931e4e89f274275853ceaeab9ce0a..6a9b673929a934e37d2abb83cc8efcb91f1fd92a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1682,7 +1682,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1687,7 +1687,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      return;
                  }
  

Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 84c48018a070e877d1caf6c1d741cd5de7d9c631..f76b3de873a28ca29b77c45c61b55f05ecff7ad8 100644
+index aaa14c132e49341fac5ad4c83bc39b3858d9b2c0..93c0b38c89f9dc6316fe8bce5ad3b01f5d2e045d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1905,7 +1905,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,10 +19,10 @@ index 84c48018a070e877d1caf6c1d741cd5de7d9c631..f76b3de873a28ca29b77c45c61b55f05
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e148fe2a094a954fd9f411851e1e84ab0e7cab3b..6a480aa1a60f3703977ebcf098ebb9bd80a63caf 100644
+index f31d8d8253ddcde645b805dd809e0a0c39403c8b..cadeb30ef8f31fcc0d626c2cc7f079c3e778704d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2559,7 +2559,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2564,7 +2564,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      }
  
      public final boolean isDisconnected() {

Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch

@@ -39,10 +39,10 @@ index 485b69140f72a22b3eae53be74bcad003dd92e8f..196d1a7fa8ac9249ca061a704b2403c7
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6a480aa1a60f3703977ebcf098ebb9bd80a63caf..8a7a066c194023ea46c26638e67282e35ffafb63 100644
+index cadeb30ef8f31fcc0d626c2cc7f079c3e778704d..bc084ade77cff987c41d148ce85fc61d6efb5feb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1807,6 +1807,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1812,6 +1812,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
          switch (packetplayinentityaction.c()) {
              case PRESS_SHIFT_KEY:
                  this.player.setSneaking(true);

Spigot-Server-Patches/0172-handle-PacketPlayInKeepAlive-async.patch

@@ -15,10 +15,10 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 20742976a345bfd8af3e6d52f7e5949b2915c0ad..65b7d478458ec439e6db12263f578e2886c6bfb2 100644
+index 3290e50440dc22f5530272c2817c594028d3432e..01747ea997a68f55803553c330287b1bbe866c29 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2520,14 +2520,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2525,14 +2525,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {

Spigot-Server-Patches/0193-Extend-Player-Interact-cancellation.patch

@@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index e413d14d6bf89b3eaf2ec06ba8634a83758d65b9..b92b04ac7cba04a04eab35642369af41ec389a23 100644
+index ee59d76d31b8b8cfd39d612b1e6040891f2256f4..36cf4c332054a350ae193637f895a45a8b04da9b 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -148,6 +148,11 @@ public class PlayerInteractManager {
@@ -28,8 +28,8 @@ index e413d14d6bf89b3eaf2ec06ba8634a83758d65b9..b92b04ac7cba04a04eab35642369af41
                      this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
                      // Update any tile entity data for this block
                      TileEntity tileentity = this.world.getTileEntity(blockposition);
-@@ -443,13 +448,32 @@ public class PlayerInteractManager {
+@@ -446,13 +451,32 @@ public class PlayerInteractManager {
-         boolean interactResult = event.useItemInHand() == Event.Result.DENY;
+         interactResult = event.useItemInHand() == Event.Result.DENY;
  
          if (event.useInteractedBlock() == Event.Result.DENY) {
 +

Spigot-Server-Patches/0211-Fix-exploit-that-allowed-colored-signs-to-be-created.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 07720ef6bd7e9f5b9084f34c48c0dc94d033531d..922dfbf6963b9b4c02f056ff39900825c6ee071e 100644
+index 4452a6e7f550f362145ce6533e6cc77c367793eb..f6d650ca21cef8961e88e07d767478eeb5ec15d1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2532,7 +2532,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2537,7 +2537,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {

Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch

@@ -88,7 +88,7 @@ index 4451fed44db1dc8b727b2bef3e0275bc9c829d6a..80962f5b1b00d5f5e07cdc1404d926d2
          this.o();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 922dfbf6963b9b4c02f056ff39900825c6ee071e..b838132b6e86f692b6576362e2b04aef96b4acfa 100644
+index f6d650ca21cef8961e88e07d767478eeb5ec15d1..e1dcdfe3b498f4c0642921dd31b5e255cc7fc4c3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -37,6 +37,7 @@ import org.bukkit.event.inventory.ClickType;
@@ -99,7 +99,7 @@ index 922dfbf6963b9b4c02f056ff39900825c6ee071e..b838132b6e86f692b6576362e2b04aef
  import org.bukkit.event.inventory.InventoryCreativeEvent;
  import org.bukkit.event.inventory.InventoryType.SlotType;
  import org.bukkit.event.player.AsyncPlayerChatEvent;
-@@ -2067,10 +2068,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2072,10 +2073,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInCloseWindow packetplayinclosewindow) {

Spigot-Server-Patches/0238-Refresh-player-inventory-when-cancelling-PlayerInter.patch

@@ -16,10 +16,10 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b838132b6e86f692b6576362e2b04aef96b4acfa..9a09d8068650916e1a0365599436d8dc3df723d4 100644
+index e1dcdfe3b498f4c0642921dd31b5e255cc7fc4c3..0512f3a2df406cc18083883e2689945067dabb71 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1980,6 +1980,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1985,6 +1985,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
  
                      if (event.isCancelled()) {

Spigot-Server-Patches/0329-Fix-sign-edit-memory-leak.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix sign edit memory leak
 when a player edits a sign, a reference to their Entity is never cleand up.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e34d64b07f556bcf00423e931d5f8d3afcd8d9d9..4825745c97ebaba9c39259502daf494f9a09e333 100644
+index d9814329c9276de1bbc0e234d1f4d137063849eb..98f3c0faaeb6fcf2665a02b047beae9e84d4f894 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2583,7 +2583,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2588,7 +2588,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
              TileEntitySign tileentitysign = (TileEntitySign) tileentity;
  

Spigot-Server-Patches/0330-Limit-Client-Sign-length-more.patch

@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4825745c97ebaba9c39259502daf494f9a09e333..400af594ba3c87dc63c7bbb591d2507044c5e680 100644
+index 98f3c0faaeb6fcf2665a02b047beae9e84d4f894..691f3354637f84d0a5b2a0c1c0f493f7de3b61af 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -104,6 +104,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -33,7 +33,7 @@ index 4825745c97ebaba9c39259502daf494f9a09e333..400af594ba3c87dc63c7bbb591d25070
      private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
  
      public PlayerConnection(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) {
-@@ -2599,6 +2600,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2604,6 +2605,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {

Spigot-Server-Patches/0341-Update-entity-Metadata-for-all-tracked-players.patch

@@ -22,10 +22,10 @@ index bbb3f88bb15c70aec7f4d223dd3c0cc986c6eb21..b8fa8a582c4e440990f7e9c426c40bb5
          this.f.accept(packet);
          if (this.tracker instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 400af594ba3c87dc63c7bbb591d2507044c5e680..13b15b713b19334a75ab15602856d9fdc757c0b1 100644
+index 691f3354637f84d0a5b2a0c1c0f493f7de3b61af..1c00f28ff41e236f684a055928c54069719ab2ac 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2037,7 +2037,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2042,7 +2042,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
                      if (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != origItem) {
                          // Refresh the current entity metadata

Spigot-Server-Patches/0389-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch

@@ -19,10 +19,10 @@ index 501eb0c0f5aac4385b3eef0c334ed0cf1944abe1..b36f4b5cd023df2e31feafe52850e2de
          if (enumhand == EnumHand.MAIN_HAND) {
              return this.getEquipment(EnumItemSlot.MAINHAND);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f1df55cfcaa3218d6e28df1448306a6f6e43ead6..3c7c092d3a2f0bf61fd9f548ff6f37ed7da6d843 100644
+index 66f86db4b04bf7059603b308cfd909f95ca7b94d..2b3baee3e6cda70f4c6d1428c47f140c674421a8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1468,6 +1468,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1473,6 +1473,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  this.player.getBukkitEntity().updateInventory(); // SPIGOT-2524
                  return;
              }

Spigot-Server-Patches/0509-Add-and-implement-PlayerRecipeBookClickEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 14ae626be2ff07640e66bad5e6e538da8cadaf7b..c1eb1cabc4221c380ad8ffdb8610141779021380 100644
+index f8826f53a3e7c44e50041516e83b92f609a53cb0..ccf3ffaee04b00e9b508a1e3c7f39bf178173d56 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2510,9 +2510,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2515,9 +2515,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinautorecipe, this, this.player.getWorldServer());
          this.player.resetIdleTimer();
          if (!this.player.isSpectator() && this.player.activeContainer.windowId == packetplayinautorecipe.b() && this.player.activeContainer.c(this.player) && this.player.activeContainer instanceof ContainerRecipeBook) {

Spigot-Server-Patches/0515-Fix-Per-World-Difficulty-Remembering-Difficulty.patch

@@ -63,10 +63,10 @@ index 4f0b79be16dbc8b528095f8ebfe80d70ef6074ce..a7b6be15b6c5d99fd8adc60c2d7f31a0
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 243d85fb29aae9435bd8eb7fbf89d8a149f1145c..3ced849007b8af3a70a737c9a0f1b15bf4e57a2a 100644
+index 1a16dfff50920eb041d4a91486d02281fe1f52bd..eb461d328349689a7ae1a905ff3e891830f28b47 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2774,7 +2774,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2779,7 +2779,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      public void a(PacketPlayInDifficultyChange packetplayindifficultychange) {
          PlayerConnectionUtils.ensureMainThread(packetplayindifficultychange, this, this.player.getWorldServer());
          if (this.player.k(2) || this.isExemptPlayer()) {

Spigot-Server-Patches/0553-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 911a6e7c2c4af9130384774072b1c92831bb1767..e0c3eab9aef950d91920076990215d79d2b710c6 100644
+index 2ac264d0b4946d22877f002a86b39e11593c8c90..3aa56d5246660aa49fa881f0b3c80c986cb4a27f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -4,6 +4,7 @@ import com.google.common.primitives.Doubles;
@@ -25,7 +25,7 @@ index 911a6e7c2c4af9130384774072b1c92831bb1767..e0c3eab9aef950d91920076990215d79
      public PlayerConnection(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) {
          this.minecraftServer = minecraftserver;
          this.networkManager = networkmanager;
-@@ -2733,6 +2736,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2738,6 +2741,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
      private static final MinecraftKey CUSTOM_REGISTER = new MinecraftKey("register");
      private static final MinecraftKey CUSTOM_UNREGISTER = new MinecraftKey("unregister");
  
@@ -34,7 +34,7 @@ index 911a6e7c2c4af9130384774072b1c92831bb1767..e0c3eab9aef950d91920076990215d79
      @Override
      public void a(PacketPlayInCustomPayload packetplayincustompayload) {
          PlayerConnectionUtils.ensureMainThread(packetplayincustompayload, this, this.player.getWorldServer());
-@@ -2760,6 +2765,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2765,6 +2770,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
              try {
                  byte[] data = new byte[packetplayincustompayload.data.readableBytes()];
                  packetplayincustompayload.data.readBytes(data);
@@ -51,7 +51,7 @@ index 911a6e7c2c4af9130384774072b1c92831bb1767..e0c3eab9aef950d91920076990215d79
                  server.getMessenger().dispatchIncomingMessage(player.getBukkitEntity(), packetplayincustompayload.tag.toString(), data);
              } catch (Exception ex) {
                  PlayerConnection.LOGGER.error("Couldn\'t dispatch custom payload", ex);
-@@ -2769,6 +2784,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2774,6 +2789,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      }
  

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 1d74403327235004ff05260d18efe4f573a69883
+Subproject commit a05df28a78f49ee2a49908d64f5140f5934f6bd8