mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
639bcbd780
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f9c7f2a Begin switching to JSpecify annotations (#11448) PaperMC/Paper@e3c8a8e Add PlayerInsertLecternBookEvent [1.20 port] (#7305) PaperMC/Paper@b410fe8 Configurable per-world void damage offset/damage(#11436) PaperMC/Paper@ea00be3 Do not NPE on uuid resolution in player profile (#11449) PaperMC/Paper@ba3c29b Finish converting all events to jspecify annotations PaperMC/Paper@e7e1ab5 Finish converting most of the undeprecated api to jspecify PaperMC/Paper@69ffbec Fix hex color check PaperMC/Paper@709f0f2 Use components properly in ProfileWhitelistVerifyEvent (#11456) PaperMC/Paper@fb76840 [ci skip] Add section on nullability annotations (#11461) PaperMC/Paper@7cd4f2c Check if leash tag has a uuid
40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@Gmail.com>
|
|
Date: Tue, 4 Jan 2022 23:05:41 -0600
|
|
Subject: [PATCH] Fix pufferfish issues
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
|
index 652ff54e7c50412503725d628bfe72ed03059790..a7c0936a1ee80618f9a504087c88814f738f4693 100644
|
|
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
|
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
|
@@ -19,6 +19,13 @@ public interface ServerBuildInfo {
|
|
*/
|
|
Key BRAND_PAPER_ID = Key.key("papermc", "paper");
|
|
|
|
+ // Purpur start
|
|
+ /**
|
|
+ * The brand id for Pufferfish.
|
|
+ */
|
|
+ Key BRAND_PUFFERFISH_ID = Key.key("pufferfish", "pufferfish");
|
|
+ // Purpur end
|
|
+
|
|
/**
|
|
* Gets the {@code ServerBuildInfo}.
|
|
*
|
|
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
|
|
index 88d5db2995829cba919d78f988d5c735cf70cb1b..494ba7e7bfe2c73d6ea3a348f023372f23a62b1c 100644
|
|
--- a/src/test/java/org/bukkit/AnnotationTest.java
|
|
+++ b/src/test/java/org/bukkit/AnnotationTest.java
|
|
@@ -47,6 +47,10 @@ public class AnnotationTest {
|
|
"org/bukkit/plugin/java/PluginClassLoader",
|
|
// Generic functional interface
|
|
"org/bukkit/util/Consumer",
|
|
+ // Purpur start
|
|
+ "gg/pufferfish/pufferfish/sentry/SentryContext",
|
|
+ "gg/pufferfish/pufferfish/sentry/SentryContext$State",
|
|
+ // Purpur end
|
|
// Paper start
|
|
"io/papermc/paper/util/TransformingRandomAccessList",
|
|
"io/papermc/paper/util/TransformingRandomAccessList$TransformedListIterator",
|