Updated Upstream (Bukkit/CraftBukkit/Spigot)

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:
4b08dbc5 PR-752: Make Leaves Waterlogged
de323fc9 Downgrade dependency version

CraftBukkit Changes:
c3f219edb Fix missing abstract in CraftLeaves
886e6d8c8 SPIGOT-7038: Setting title or subtitle to empty string causes the player to disconnect
6c302a5e3 Make Leaves Waterlogged
53b681be5 Downgrade dependency version

Spigot Changes:
ee737122 Fixed system messages shown in action bar
f343df82 SPIGOT-7036: Don't use CHAT message type
63a06049 SPIGOT-7035: Actionbar Sending in Main Chat

1 files changed, 7 insertions, 7 deletions

diff --git a/patches/server/0180-Player.setPlayerProfile-API.patch b/patches/server/0180-Player.setPlayerProfile-API.patch
index 3b7e23734d..a304d1ecfb 100644
--- a/patches/server/0180-Player.setPlayerProfile-API.patch
+++ b/patches/server/0180-Player.setPlayerProfile-API.patch
@@ -24,10 +24,10 @@ index 5c73ee9b2d3328c9174db067ce674401d7ff5dc9..136ff7de4ffb91d3fc84a90560a2f5db
                          playerName = gameProfile.getName();
                          uniqueId = gameProfile.getId();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 67ef5832f475894feea4345b50fbbdd3a02c8ea1..b666b1a52d35b2092f8095f7257fd1581f6766d9 100644
+index b87be952c65e92c99bbb4ca961519ba20ebb4155..09cde5fc320be42f2bd1e9f3aa7c1c70eabf2923 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -76,6 +76,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
+@@ -75,6 +75,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
  import net.minecraft.world.inventory.AbstractContainerMenu;
  import net.minecraft.world.level.GameType;
  import net.minecraft.world.level.block.Blocks;
@@ -35,7 +35,7 @@ index 67ef5832f475894feea4345b50fbbdd3a02c8ea1..b666b1a52d35b2092f8095f7257fd158
  import net.minecraft.world.level.block.entity.SignBlockEntity;
  import net.minecraft.world.level.border.BorderChangeListener;
  import net.minecraft.world.level.saveddata.maps.MapDecoration;
-@@ -202,11 +203,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -201,11 +202,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return server.getPlayer(getUniqueId()) != null;
      }
  
@@ -47,7 +47,7 @@ index 67ef5832f475894feea4345b50fbbdd3a02c8ea1..b666b1a52d35b2092f8095f7257fd158
      @Override
      public InetSocketAddress getAddress() {
          if (this.getHandle().connection == null) return null;
-@@ -1480,8 +1476,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1479,8 +1475,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.hiddenEntities.put(entity.getUniqueId(), hidingPlugins);
  
          // Remove this entity from the hidden player's EntityTrackerEntry
@@ -64,7 +64,7 @@ index 67ef5832f475894feea4345b50fbbdd3a02c8ea1..b666b1a52d35b2092f8095f7257fd158
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
          if (entry != null) {
              entry.removePlayer(this.getHandle());
-@@ -1494,8 +1497,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1493,8 +1496,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  this.getHandle().connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, otherPlayer));
              }
          }
@@ -73,7 +73,7 @@ index 67ef5832f475894feea4345b50fbbdd3a02c8ea1..b666b1a52d35b2092f8095f7257fd158
      }
  
      @Override
-@@ -1532,8 +1533,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1531,8 +1532,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          this.hiddenEntities.remove(entity.getUniqueId());
  
@@ -90,7 +90,7 @@ index 67ef5832f475894feea4345b50fbbdd3a02c8ea1..b666b1a52d35b2092f8095f7257fd158
  
          if (other instanceof ServerPlayer) {
              ServerPlayer otherPlayer = (ServerPlayer) other;
-@@ -1544,9 +1552,51 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1543,9 +1551,51 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (entry != null && !entry.seenBy.contains(this.getHandle().connection)) {
              entry.updatePlayer(this.getHandle());
          }