Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-21 15:59:23 +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@9dab7fe Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2023-07-27 03:07:38 +03:00
parent 792e8c243f
commit 19d2c2d817
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = gq.bxteam.divinemc group = gq.bxteam.divinemc
version = 1.20.1-R0.1-SNAPSHOT version = 1.20.1-R0.1-SNAPSHOT
purpurRef = 7cefa0cafab8223cff8a3ff754129b3e5c41bad3 purpurRef = 9dab7fe5f10e577b72673d644022a4867c0073e3
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

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 32ec30d916380d2f9cfde35a2406cc3bb4da292d..a3654816c007c29a5358d75ee4301502c5a2fadd 100644 index aa517a7c1e69f197d59d6a2cad73cf9199ac6129..049c2e6433f1537b7f0822969ea22dac5bbba60d 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
@@ -2335,15 +2335,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -2334,15 +2334,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
} }
} }

6
patches/server/0022-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 a3654816c007c29a5358d75ee4301502c5a2fadd..317d34c61435a2609977df00699cadd47b84e819 100644 index 049c2e6433f1537b7f0822969ea22dac5bbba60d..19b7c92f10bfdb609641f414ddac8130e33f75f4 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
@@ -2489,6 +2489,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -2488,6 +2488,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
nbt.putBoolean("Purpur.FireImmune", immuneToFire); nbt.putBoolean("Purpur.FireImmune", immuneToFire);
} }
// Purpur end // Purpur end
@@ -28,7 +28,7 @@ index a3654816c007c29a5358d75ee4301502c5a2fadd..317d34c61435a2609977df00699cadd4
return nbt; return nbt;
} catch (Throwable throwable) { } catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2566,6 +2577,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -2565,6 +2576,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.reapplyPosition(); this.reapplyPosition();
} }