From 19aed49fac9772bb4bb00b3941e95a1a8fc8a40f Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Wed, 9 Jun 2021 10:53:30 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
c64958508 fix: wrong return in javadocs for bookmeta (#5579)
---
 Paper                                              |  2 +-
 ...javadoc-warnings-missing-param-and-return.patch |  4 ++--
 ...lict-on-change-for-adventure-deprecations.patch | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Paper b/Paper
index 3dbb8926e..c64958508 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 3dbb8926e56033a6b20a00b7312b9bce3dd69473
+Subproject commit c6495850826bcd797b9d0e21d1a4349117fa6868
diff --git a/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
index caccb771b..b712f8088 100644
--- a/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
+++ b/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
@@ -1490,10 +1490,10 @@ index e7d905b1146b2bdd2da5bdeb6bf3541fb181d59e..1fab68c9de96b0d362ebf85fd675cc19
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
-index fdbd32c4bb6428f2dde484ecb53acdaaba2a0d18..7357c166115f346a1efebd0f0f2d5491de6a9a39 100644
+index 4947251f347d83fa326a67735293401c10d87ba4..248cd6faa72a91ceaf6f74d06c05d05bd26f5fbc 100644
 --- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
-@@ -313,6 +313,9 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
+@@ -315,6 +315,9 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
      BookMeta clone();
  
      // Spigot start
diff --git a/patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch
index 2f1494643..0cbe2e1b8 100644
--- a/patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch
+++ b/patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch
@@ -626,10 +626,10 @@ index b06995aa57aa9cba0bb59f1d26d81015619a08e6..5e33fe46ab9bb034acc6a38a3c00c33c
      public abstract String getTitle();
  }
 diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
-index 7357c166115f346a1efebd0f0f2d5491de6a9a39..b90cb7aa98ea40573557a80ca5c7be7c5c494956 100644
+index 248cd6faa72a91ceaf6f74d06c05d05bd26f5fbc..6ec728854333cd473528162b6381e7a5a83532d8 100644
 --- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
-@@ -242,7 +242,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
+@@ -244,7 +244,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
       * @deprecated in favour of {@link #page(int)}
       */
      @NotNull
@@ -638,7 +638,7 @@ index 7357c166115f346a1efebd0f0f2d5491de6a9a39..b90cb7aa98ea40573557a80ca5c7be7c
      String getPage(int page);
  
      /**
-@@ -258,7 +258,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
+@@ -260,7 +260,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
       * @param data the data to set for that page
       * @deprecated in favour of {@link #page(int, net.kyori.adventure.text.Component)}
       */
@@ -647,7 +647,7 @@ index 7357c166115f346a1efebd0f0f2d5491de6a9a39..b90cb7aa98ea40573557a80ca5c7be7c
      void setPage(int page, @NotNull String data);
  
      /**
-@@ -268,7 +268,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
+@@ -270,7 +270,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
       * @deprecated in favour of {@link #pages()}
       */
      @NotNull
@@ -656,7 +656,7 @@ index 7357c166115f346a1efebd0f0f2d5491de6a9a39..b90cb7aa98ea40573557a80ca5c7be7c
      List<String> getPages();
  
      /**
-@@ -278,7 +278,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
+@@ -280,7 +280,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
       * @param pages A list of pages to set the book to use
       * @deprecated in favour of {@link #pages(List)}
       */
@@ -665,7 +665,7 @@ index 7357c166115f346a1efebd0f0f2d5491de6a9a39..b90cb7aa98ea40573557a80ca5c7be7c
      void setPages(@NotNull List<String> pages);
  
      /**
-@@ -288,7 +288,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
+@@ -290,7 +290,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
       * @param pages A list of strings, each being a page
       * @deprecated in favour of {@link #pages(net.kyori.adventure.text.Component...)}
       */
@@ -674,7 +674,7 @@ index 7357c166115f346a1efebd0f0f2d5491de6a9a39..b90cb7aa98ea40573557a80ca5c7be7c
      void setPages(@NotNull String... pages);
  
      /**
-@@ -298,7 +298,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
+@@ -300,7 +300,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book {
       * @param pages A list of strings, each being a page
       * @deprecated in favour of {@link #addPages(net.kyori.adventure.text.Component...)}
       */