mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
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 f9e4b16a21d6cc6c9cbbe06d20c8af25e72e3ddb..4028b230e7fe1c78520f227a377a2a61e8381ecc 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",
|