Skip to content

Commit 7b8e0c3

Browse files
committed
Updated Upstream (Bukkit/CraftBukkit)
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 Bukkit Changes: 6fac07e SPIGOT-6935: Make Arrow color nullable abbc5c5 PR-730: Added a checkstyle rule to check for missing package declarations. 97157b1 PR-730: Added missing declaration of the org.bukkit.profile package. 9dcee1d PR-727: Fix typo in StriderTemperatureChangeEvent javadocs CraftBukkit Changes: 1e87776 SPIGOT-6935: Make Arrow color nullable
1 parent 5bb4549 commit 7b8e0c3

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

patches/api/0001-Convert-project-to-Gradle.patch

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ index 0000000000000000000000000000000000000000..c76bfbcfbe034700bdbd9396643cfca6
9999
+}
100100
diff --git a/pom.xml b/pom.xml
101101
deleted file mode 100644
102-
index 9c130bf7fe7ec4b6b5d4f4c30cdbe6dc75b0f9a0..0000000000000000000000000000000000000000
102+
index 2bd4a47e18c0fb798d52d204a4315a889b0e64b4..0000000000000000000000000000000000000000
103103
--- a/pom.xml
104104
+++ /dev/null
105-
@@ -1,262 +0,0 @@
105+
@@ -1,263 +0,0 @@
106106
-
107107
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
108108
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -330,6 +330,7 @@ index 9c130bf7fe7ec4b6b5d4f4c30cdbe6dc75b0f9a0..00000000000000000000000000000000
330330
- </executions>
331331
- <configuration>
332332
- <configLocation>checkstyle.xml</configLocation>
333+
- <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
333334
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
334335
- </configuration>
335336
- <dependencies>

work/Bukkit

Submodule Bukkit updated from 8d81803 to 6fac07e

work/CraftBukkit

Submodule CraftBukkit updated from c0326c2 to 1e87776

0 commit comments

Comments
 (0)