Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix package issue in pufferfish patch

Browse Source
This commit is contained in:
granny
2023-06-25 16:38:04 -07:00
parent 7ed65d47b4
commit 07dbb3d5ae
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..17cd04c061044a41cc37f3770c1844fab1674a7c 100644 index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..0664722c38d4218aae81af4977f7c5c0723195f7 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -7,8 +7,12 @@ plugins { @@ -7,8 +7,12 @@ plugins {
@@ -44,7 +44,7 @@ index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..17cd04c061044a41cc37f3770c1844fa
+ // Pufferfish start + // Pufferfish start
+ implementation("org.yaml:snakeyaml:1.32") + implementation("org.yaml:snakeyaml:1.32")
+ implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.8.4") { + implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
+ exclude(group="org.yaml", module="snakeyaml") + exclude(group="org.yaml", module="snakeyaml")
+ } + }
+ // Pufferfish end + // Pufferfish end

4
patches/server/0003-Rebrand.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 17cd04c061044a41cc37f3770c1844fab1674a7c..2c5ef872dd62a1ee427d6fd0e70be10a0afcdedd 100644 index 0664722c38d4218aae81af4977f7c5c0723195f7..4b0eee46d899cb641988ef7a3b5b61e938b76c71 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -7,12 +7,12 @@ plugins { @@ -7,12 +7,12 @@ plugins {
@@ -35,7 +35,7 @@ index 17cd04c061044a41cc37f3770c1844fab1674a7c..2c5ef872dd62a1ee427d6fd0e70be10a
+ +
// Pufferfish start // Pufferfish start
implementation("org.yaml:snakeyaml:1.32") implementation("org.yaml:snakeyaml:1.32")
implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.8.4") { implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
@@ -83,7 +87,7 @@ tasks.jar { @@ -83,7 +87,7 @@ tasks.jar {
attributes( attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main", "Main-Class" to "org.bukkit.craftbukkit.Main",