Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-19 14:59:25 +00:00
Code Issues Releases Activity

Updated Upstream (Purpur)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@6aec125 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2023-12-26 00:36:48 +03:00
parent adf5767637
commit 9a892d0c1d
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/automatic-update.yml vendored
View File

@@ -39,8 +39,7 @@ jobs:
cd DivineMC cd DivineMC
if ! git diff --quiet; then if ! git diff --quiet; then
git add gradle.properties git add gradle.properties
git config user.name "Github Actions" git config --global user.email "no-reply@github.com" && git config --global user.name "Github Actions"
git config user.email "no-reply@github.com"
git commit -m "Updated Upstream (Purpur)" git commit -m "Updated Upstream (Purpur)"
git push git push
else else

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = gq.bxteam.divinemc group = gq.bxteam.divinemc
version = 1.20.4-R0.1-SNAPSHOT version = 1.20.4-R0.1-SNAPSHOT
purpurRef = c80f192aa29849bc69746a88a8efd3ee8a9fbaa8 purpurRef = 6aec125590f0c6a88858f1541244e95e82bce4cb
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

8
patches/server/0001-Divine-Branding.patch
View File

@@ -5,19 +5,19 @@ Subject: [PATCH] Divine Branding
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index d7951a9b3819ddc1d42e10d40bdf57ae47666d89..170fc1ba1639dc2bc8e85416732cb81f6c0c820c 100644 index 12f4b3d753b56947e3759888ba3d98fa693c2a3f..c00518b51d3430d9af27b9102d4038952e4837fa 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -28,7 +28,7 @@ repositories { @@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
dependencies { dependencies {
extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT"))
// Purpur start // Purpur start
- implementation(project(":purpur-api")) - implementation(project(":purpur-api"))
+ implementation(project(":divinemc-api")) // DivineMC + implementation(project(":divinemc-api")) // DivineMC
implementation("io.papermc.paper:paper-mojangapi:${project.version}") { implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
exclude("io.papermc.paper", "paper-api") exclude("io.papermc.paper", "paper-api")
} }
@@ -92,7 +92,7 @@ tasks.jar { @@ -78,7 +78,7 @@ tasks.jar {
attributes( attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main", "Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit", "Implementation-Title" to "CraftBukkit",

4
patches/server/0007-Fix-entity-serialization.patch
View File

@@ -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 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 --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/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
} }
} }

6
patches/server/0019-Fix-MC-2025.patch
View File

@@ -7,10 +7,10 @@ Original post on Mojira: https://bugs.mojang.com/browse/MC-2025
Fix taken from Reddit: https://redd.it/8pgd4q 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 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 --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/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); nbttagcompound.putBoolean("Purpur.FireImmune", immuneToFire);
} }
// Purpur end // Purpur end
@@ -28,7 +28,7 @@ index 93cf451254e57a858c874c8c359db68f06fc8f9a..52bb14a442709caf3b2d82a4c5f60a09
return nbttagcompound; return nbttagcompound;
} catch (Throwable throwable) { } catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); 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(); this.reapplyPosition();
} }