Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-03 22:16:22 +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@b1464f3 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-05-30 22:22:33 +03:00
parent 618ce1fe3e
commit 485032262b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
mcVersion = 1.20.6
version = 1.20.6-R0.1-SNAPSHOT
purpurRef = ec1b4fa7ad3101638fc9a4542fc24153e03ce61f
purpurRef = b1464f3bf7c39370cc89268b58a975eaffab0bbe
org.gradle.caching = true
org.gradle.parallel = true

6
patches/server/0035-Delete-Timings.patch
View File

@@ -1216,7 +1216,7 @@ index 5ae3decf100d21f7d4a471c155eaf5e00e996580..22d38bd7a8434685f2af084f1c608f48
@Nullable
private String descriptionId;
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
index 8dc1436fe78759cee5247cc28e8a18999e738a1b..ce3cc2d4b8cdfae98c02e03f7290c6115b0198d7 100644
index cd0e43f4c53a746dd6183a8406269f9b11ad3571..54657ac895fb2fa9c58910d5421f0082d140cfed 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
@@ -33,14 +33,9 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
@@ -1355,7 +1355,7 @@ index d3ec817e95628f1fc8be4a29c9a0f13c7d5fd552..e9798517b9211c50a20ea5c69603aab3
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 777f1d11d9fb5af29ec895383902daf348eb528e..93839b8dc59dbf1c07f9195a4a984ced743b36ed 100644
index de3f413dc60ee501e540b68a7b3c1118c750ca0b..b8a2731cf0a3e194cdb82b250dc29b1175667f12 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -219,7 +219,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -1367,7 +1367,7 @@ index 777f1d11d9fb5af29ec895383902daf348eb528e..93839b8dc59dbf1c07f9195a4a984ced
}
// Paper end
@@ -497,7 +497,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -498,7 +498,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
// Paper start
@Override
public String getTimingsServerName() {