Updated Upstream (CraftBukkit/Spigot) (#9598)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
b76ceb4f5 PR-1235: Move EntityType return to base Entity class
e795d7490 SPIGOT-7458: Exception when Entity CommandSender executes Vanilla command
46c7fc3b1 SPIGOT-7452: Player#openSign cannot edit
d91e5aa0b SPIGOT-7447: Rewrite --forceUpgrade to minimise diff and properly handle CraftBukkit world layout
921ae06d6 Revert "SPIGOT-7447: Fix --forceUpgrade"

Spigot Changes:
94e187b5 Rebuild patches
3bce7935 SPIGOT-7091: Update bungeecord-chat
This commit is contained in:
Jake Potrebic 2023-08-13 16:32:51 -07:00 committed by GitHub
parent 93829bba5a
commit a73ed9572e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
354 changed files with 444 additions and 479 deletions

View file

@ -5,11 +5,11 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 232cc8fafb1d7d9730cf2f58777e8977995ec28b..3faf250d59eeefb8477a6e1454914bdd88ff11d6 100644
index c2e5d8006420aab5a60e5aaa188223aeb0396483..ffd1c792b0e0fe1ed3da85cf933202c5193734ce 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,15 +17,27 @@ dependencies {
api("net.md-5:bungeecord-chat:1.16-R0.4")
@@ -18,15 +18,27 @@ dependencies {
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
api("org.yaml:snakeyaml:2.0")
api("org.joml:joml:1.10.5")
+ // Paper start
@ -37,16 +37,16 @@ index 232cc8fafb1d7d9730cf2f58777e8977995ec28b..3faf250d59eeefb8477a6e1454914bdd
testImplementation("org.apache.commons:commons-lang3:3.12.0")
testImplementation("junit:junit:4.13.2")
testImplementation("org.hamcrest:hamcrest-library:1.3")
@@ -67,7 +79,7 @@ tasks.withType<Javadoc> {
@@ -68,7 +80,7 @@ tasks.withType<Javadoc> {
options.links(
"https://guava.dev/releases/31.1-jre/api/docs/",
"https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
- "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
+ "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
"https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
)
options.tags("apiNote:a:API Note:")
@@ -83,3 +95,14 @@ tasks.withType<Javadoc> {
@@ -84,3 +96,14 @@ tasks.withType<Javadoc> {
}
}
}