Update to 1.20.6

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@8f7ac62 Validate manifest provided mapping namespace (#10612)
PaperMC/Paper@fbe3c00 [ci skip] update projects workflow configuration
PaperMC/Paper@44ee092 1.20.6 (#10623)
PaperMC/Paper@812ccb9 fix spawnChunkRadius gamerule resetting
This commit is contained in:
granny
2024-04-29 15:49:34 -07:00
parent 942fc72e5e
commit 7a08bb73c9
9 changed files with 32 additions and 32 deletions

View File

@@ -94,7 +94,7 @@ index 151e856dda3aa262c846ce8793650ee582bfb749..be0ed8a14e5726d5fcea1864302b18fb
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
index c3503eaec5c5ece6e27a52fb703d06ec7c767383..ed7b41604fb201c346c362803bb9280831c0d0fb 100644
index d47bc2f54c4722a0b8c419b99ee57eb3cb25d750..fdeabdcc781b605d6f3ee18528fd380ffff95660 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
@@ -28,6 +28,7 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable
@@ -115,7 +115,7 @@ index c3503eaec5c5ece6e27a52fb703d06ec7c767383..ed7b41604fb201c346c362803bb92808
@Override
@@ -47,6 +49,7 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable
if (nbt.contains("CustomName", 8)) {
this.name = io.papermc.paper.util.MCUtil.getBaseComponentFromNbt("CustomName", nbt, registryLookup); // Paper - Catch ParseException
this.name = parseCustomNameSafe(nbt.getString("CustomName"), registryLookup);
}
+ this.lapis = nbt.getInt("Purpur.Lapis"); // Purpur
}