Skip to content

Commit 6f17a3d

Browse files
committed
add back pufferfish patches \o/
1 parent 10685bb commit 6f17a3d

360 files changed

Lines changed: 842 additions & 821 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

patches/unapplied/api/0001-Pufferfish-API-Changes.patch renamed to patches/api/0001-Pufferfish-API-Changes.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ You should have received a copy of the GNU General Public License
2020
along with this program. If not, see <http://www.gnu.org/licenses/>.
2121

2222
diff --git a/build.gradle.kts b/build.gradle.kts
23-
index e827ee211e3c65dc68ac5867fd8476639df63645..b9c75a190dbd7a90ac5ef0fbc6e6fe34806acc4e 100644
23+
index bf01892c248b988531d21d9fb0f74d0adf2205ac..80833c13a2d19e31d6f648e7ef5b3456025e767e 100644
2424
--- a/build.gradle.kts
2525
+++ b/build.gradle.kts
26-
@@ -47,6 +47,7 @@ dependencies {
26+
@@ -51,6 +51,7 @@ dependencies {
2727
apiAndDocs("net.kyori:adventure-text-logger-slf4j")
2828
api("org.apache.logging.log4j:log4j-api:$log4jVersion")
2929
api("org.slf4j:slf4j-api:$slf4jVersion")
3030
+ api("io.sentry:sentry:5.4.0") // Pufferfish
3131

32-
implementation("org.ow2.asm:asm:9.4")
33-
implementation("org.ow2.asm:asm-commons:9.4")
34-
@@ -106,6 +107,13 @@ val generateApiVersioningFile by tasks.registering {
32+
implementation("org.ow2.asm:asm:9.5")
33+
implementation("org.ow2.asm:asm-commons:9.5")
34+
@@ -109,6 +110,13 @@ val generateApiVersioningFile by tasks.registering {
3535
}
3636
}
3737

patches/unapplied/api/0001-Fix-pufferfish-issues.patch renamed to patches/api/0002-Fix-pufferfish-issues.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix pufferfish issues
55

66

77
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
8-
index 06e96e5c98f1a7a68c8b4b5e527314c1aa774e38..49bba9a7a02b9cf3a552583315eff2b7dbe060c0 100644
8+
index 88f1ca89fa640a686231b8eec87e70419b2d73ef..d6b91c49a267c89d7df2ddee7ccfe64675d117be 100644
99
--- a/src/test/java/org/bukkit/AnnotationTest.java
1010
+++ b/src/test/java/org/bukkit/AnnotationTest.java
1111
@@ -47,6 +47,10 @@ public class AnnotationTest {
File renamed without changes.

patches/api/0002-Build-System-Changes.patch renamed to patches/api/0004-Build-System-Changes.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Build System Changes
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index 9d817bf3f26ffd484945a00a6538970eca22ee20..dc322b5d5458163c5b1de2a74d3d2edb1a4dac76 100644
8+
index 80833c13a2d19e31d6f648e7ef5b3456025e767e..0a33275fdf16bda47771bab9ddfeb2bf8616c2dc 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
11-
@@ -121,6 +121,8 @@ tasks.jar {
11+
@@ -129,6 +129,8 @@ tasks.jar {
1212
}
1313

1414
tasks.withType<Javadoc> {
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)