[ci skip] rebuild patches

patches/server/0010-Adventure.patch

@@ -2322,14 +2322,13 @@ index 000fd11480d783eab80a93fedde48f66e6b1298b..b3b6121dcfb6451d177431d51fa8a3e0
 -    @Deprecated
 -    public void disconnect(Component reason) {
 -        this.disconnect(CraftChatMessage.fromComponent(reason));
--    }
--    // CraftBukkit end
--
-     public void disconnect(String s) {
++    public void disconnect(String s) {
 +        // Paper start
 +        this.disconnect(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(s));
-+    }
-+
+     }
+-    // CraftBukkit end
+ 
+-    public void disconnect(String s) {
 +    public void disconnect(final Component reason) {
 +        this.disconnect(PaperAdventure.asAdventure(reason));
 +    }
@@ -2810,13 +2809,13 @@ index 059ba63319f6ca04750a7d6b095e6179cae68b4f..cb2dc6db887856c5f60d127f5999a078
      }
  
 +    // Paper start
-     @Override
++    @Override
 +    public net.kyori.adventure.text.Component shutdownMessage() {
 +        String msg = getShutdownMessage();
 +        return msg != null ? net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(msg) : null;
 +    }
 +    // Paper end
-+    @Override
+     @Override
 +    @Deprecated // Paper
      public String getShutdownMessage() {
          return this.configuration.getString("settings.shutdown-message");
@@ -2893,12 +2892,12 @@ index 059ba63319f6ca04750a7d6b095e6179cae68b4f..cb2dc6db887856c5f60d127f5999a078
      }
  
 +    // Paper start
-     @Override
++    @Override
 +    public Merchant createMerchant(net.kyori.adventure.text.Component title) {
 +        return new org.bukkit.craftbukkit.inventory.CraftMerchantCustom(title == null ? InventoryType.MERCHANT.defaultTitle() : title);
 +    }
 +    // Paper end
-+    @Override
+     @Override
 +    @Deprecated // Paper
      public Merchant createMerchant(String title) {
          return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);