rebuild

patches/Purpur/patches/api/0017-ItemStack-convenience-methods.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 0a31a5321ac519568db936c94394f71b2e2fcec1..42a77a5f5b8968351a737cb1fd7cebf160b13245 100644
+index 7b77c7132723a01e8c38ddaa616b363be300b653..c6b1131b1700797e0515045f4e5c81f85aa3449f 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -8660,4 +8660,36 @@ public enum Material implements Keyed {
+@@ -8649,4 +8649,36 @@ public enum Material implements Keyed {
              // </editor-fold>
          }
      }

patches/Purpur/patches/api/0031-Fix-javadoc-warnings-missing-param-and-return.patch

@@ -490,7 +490,7 @@ index 28a1fe3af1546daa779df46468e0ff8ad823f9ca..7a3be414ef9d54d7a852ba92d704011f
 
          @NotNull
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 7f90ef2fd1c87c5b8b69f2e9dba3ad8e6e9ce3ec..85f77a58bf6c21da815b6652c7b50d578951a14c 100644
+index f486d7c819f6330223980793c9b086fded0af059..632e53338c4d902aea7e8589152b1c1b6e6dde6a 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -81,6 +81,8 @@ public interface UnsafeValues {

patches/Purpur/patches/api/0036-Add-unsafe-Entity-serialization-API.patch

@@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 85f77a58bf6c21da815b6652c7b50d578951a14c..59a91250d80e6f67a32cb4c7a216f1389338ddbf 100644
+index 632e53338c4d902aea7e8589152b1c1b6e6dde6a..e64d28359c6f5180f1dfd3896a5ba99fd30a943c 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -152,4 +152,28 @@ public interface UnsafeValues {
-      */
-     public io.papermc.paper.inventory.ItemRarity getItemStackRarity(ItemStack itemStack);
+@@ -136,4 +136,28 @@ public interface UnsafeValues {
+     public int nextEntityId();
+
      // Paper end
 +
 +    // Purpur start

patches/Purpur/patches/server/0001-Rebrand.patch

@@ -199,7 +199,7 @@ index f994e99ebc8fe22e6f6b45f6379ec410a598789f..eeae4862898f093ca4b9819d0d08fdaf
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 57d56ff1b41582f0d249b24165d5b08b02b0f9fe..81cff601a5161c30df90de3cefc18d72cd7ee347 100644
+index 00e53d577b1dcaccb409e62d35165ee015de9330..7de7afae711800154735411947ff140c76d5171f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -377,7 +377,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

patches/Purpur/patches/server/0168-Add-unsafe-Entity-serialization-API.patch

@@ -46,7 +46,7 @@ index 4c592f6d4d6cbeb4c3225e7794f4b1d6c8d62394..b441dac8f31b679aa7e36d23848d34e2
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 81cff601a5161c30df90de3cefc18d72cd7ee347..980696490709d04741c1617f528357100696d0e5 100644
+index 7de7afae711800154735411947ff140c76d5171f..b14e9a2cd6e849fe91a2512f379036a284323420 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -390,9 +390,14 @@ public final class CraftMagicNumbers implements UnsafeValues {

patches/Tuinity/patches/server/0061-Rewrite-the-light-engine.patch

@@ -37,10 +37,10 @@ by 2x. According to cpu time, the light engine itself spent 10x less time
 lighting chunks for generation.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 2f2701b9f0aa1a26a3e3eb7a14eac370f509ce1e..9d2ef2639f7a04aaf960be70384df24d8b4daf09 100644
+index dcbee6ebfac34f793c18f21e07187ae7dcb37695..a94503b8f27a8c616bb99b0713df8f6c3fc5b7ec 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -219,6 +219,44 @@ public class PaperCommand extends Command {
+@@ -186,6 +186,44 @@ public class PaperCommand extends Command {
          }
      }
 
@@ -85,7 +85,7 @@ index 2f2701b9f0aa1a26a3e3eb7a14eac370f509ce1e..9d2ef2639f7a04aaf960be70384df24d
      private void doFixLight(CommandSender sender, String[] args) {
          if (!(sender instanceof Player)) {
              sender.sendMessage("Only players can use this command");
-@@ -227,7 +265,7 @@ public class PaperCommand extends Command {
+@@ -194,7 +232,7 @@ public class PaperCommand extends Command {
          int radius = 2;
          if (args.length > 1) {
              try {
@@ -94,7 +94,7 @@ index 2f2701b9f0aa1a26a3e3eb7a14eac370f509ce1e..9d2ef2639f7a04aaf960be70384df24d
              } catch (Exception e) {
                  sender.sendMessage("Not a number");
                  return;
-@@ -240,6 +278,13 @@ public class PaperCommand extends Command {
+@@ -207,6 +245,13 @@ public class PaperCommand extends Command {
          net.minecraft.server.WorldServer world = (WorldServer) handle.world;
          LightEngineThreaded lightengine = world.getChunkProvider().getLightEngine();
 

patches/server/0002-Brandings.patch

@@ -79,7 +79,7 @@ index 448538cc8a3d16b028a0a6f0f05c9370a02f4259..e51dcb259d511c369806a83b96c2820f
                          //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
                          // Paper End
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 980696490709d04741c1617f528357100696d0e5..c8221a59faae602e870bd14f3b74ac94ca71bd77 100644
+index b14e9a2cd6e849fe91a2512f379036a284323420..54aebe9da1f31b3250b349a91e78eadb7a031096 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -377,7 +377,7 @@ public final class CraftMagicNumbers implements UnsafeValues {