Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-21 07:49:18 +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@ad03187 drop exact choice recipe book clicks patch, supercedes #1446
PurpurMC/Purpur@ff126d3 Updated Upstream (Paper)
PurpurMC/Purpur@0458d84 Updated Upstream (Paper & Pufferfish)
PurpurMC/Purpur@7aa6845 Add option to disable the copper oxidation proximity penalty (#1443)
This commit is contained in:
NONPLAYT
2023-10-17 01:55:31 +03:00
parent 46b2883a3a
commit 181a454042
11 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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
index 84643f0dd71530a5f18557f299d7725a8f53666e..d9c33726e4ef6199ef5d060e660c2ec5f18b2dfa 100644
index 0e192a128c87124956fcec552362ab763bac5e55..c7846eb58611354b9be29ea9a478c076d3f16620 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2285,15 +2285,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2297,15 +2297,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
}
@@ -25,7 +25,7 @@ index 84643f0dd71530a5f18557f299d7725a8f53666e..d9c33726e4ef6199ef5d060e660c2ec5
return this.isPassenger() ? false : this.saveAsPassenger(nbt);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 717b1f797d28129a0f5c7c9c7b01691aa4f14317..ca3ddf2084d24a535609103ffb7e3061ed9d8c0c 100644
index 33ea5172bb7fe1018bc39acc16963f4998ac52b2..d4f88fcb3081f30ef1c4f209097f8cea8d8579d5 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -488,8 +488,13 @@ public final class CraftMagicNumbers implements UnsafeValues {