diff --git a/.github/workflows/automatic-update.yml b/.github/workflows/automatic-update.yml index b5d731e..e8f01fa 100644 --- a/.github/workflows/automatic-update.yml +++ b/.github/workflows/automatic-update.yml @@ -39,8 +39,7 @@ jobs: cd DivineMC if ! git diff --quiet; then git add gradle.properties - git config user.name "Github Actions" - git config user.email "no-reply@github.com" + git config --global user.email "no-reply@github.com" && git config --global user.name "Github Actions" git commit -m "Updated Upstream (Purpur)" git push else diff --git a/gradle.properties b/gradle.properties index dfd6adf..f591abe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = gq.bxteam.divinemc version = 1.20.4-R0.1-SNAPSHOT -purpurRef = c80f192aa29849bc69746a88a8efd3ee8a9fbaa8 +purpurRef = 6aec125590f0c6a88858f1541244e95e82bce4cb org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Divine-Branding.patch b/patches/server/0001-Divine-Branding.patch index 2f3886a..8178211 100644 --- a/patches/server/0001-Divine-Branding.patch +++ b/patches/server/0001-Divine-Branding.patch @@ -5,19 +5,19 @@ Subject: [PATCH] Divine Branding diff --git a/build.gradle.kts b/build.gradle.kts -index d7951a9b3819ddc1d42e10d40bdf57ae47666d89..170fc1ba1639dc2bc8e85416732cb81f6c0c820c 100644 +index 12f4b3d753b56947e3759888ba3d98fa693c2a3f..c00518b51d3430d9af27b9102d4038952e4837fa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -28,7 +28,7 @@ repositories { +@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating + dependencies { - extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT")) // Purpur start - implementation(project(":purpur-api")) + implementation(project(":divinemc-api")) // DivineMC implementation("io.papermc.paper:paper-mojangapi:${project.version}") { exclude("io.papermc.paper", "paper-api") } -@@ -92,7 +92,7 @@ tasks.jar { +@@ -78,7 +78,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", diff --git a/patches/server/0007-Fix-entity-serialization.patch b/patches/server/0007-Fix-entity-serialization.patch index 5058783..0eb0cfc 100644 --- a/patches/server/0007-Fix-entity-serialization.patch +++ b/patches/server/0007-Fix-entity-serialization.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix entity serialization diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ef9c44206739d95efead0d6584566f97b6a56c6a..93cf451254e57a858c874c8c359db68f06fc8f9a 100644 +index b21dd27e77632435ea53b48861fe16ee03d5ba06..773d19d93985cd132556918eb030d1cf5623c604 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2329,15 +2329,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -2324,15 +2324,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S } } diff --git a/patches/server/0019-Fix-MC-2025.patch b/patches/server/0019-Fix-MC-2025.patch index af9bc29..310b1d1 100644 --- a/patches/server/0019-Fix-MC-2025.patch +++ b/patches/server/0019-Fix-MC-2025.patch @@ -7,10 +7,10 @@ Original post on Mojira: https://bugs.mojang.com/browse/MC-2025 Fix taken from Reddit: https://redd.it/8pgd4q diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 93cf451254e57a858c874c8c359db68f06fc8f9a..52bb14a442709caf3b2d82a4c5f60a09e705d91c 100644 +index 773d19d93985cd132556918eb030d1cf5623c604..d5716c437ab40866d5edad67a0bf94a72f4475af 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2495,6 +2495,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -2490,6 +2490,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S nbttagcompound.putBoolean("Purpur.FireImmune", immuneToFire); } // Purpur end @@ -28,7 +28,7 @@ index 93cf451254e57a858c874c8c359db68f06fc8f9a..52bb14a442709caf3b2d82a4c5f60a09 return nbttagcompound; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); -@@ -2572,6 +2583,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S +@@ -2567,6 +2578,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S this.reapplyPosition(); }