Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@18fabc0 Remove CraftItemStack#setAmount null assignment (#8807)
PaperMC/Paper@9147456 Updated Upstream (CraftBukkit/Spigot) (#8815)
PaperMC/Paper@4da844f Fix force-opening enchantment tables (#8820)
This commit is contained in:
granny
2023-01-31 19:41:34 -08:00
parent 789233aa7f
commit c44c800b3a
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0156-Config-to-allow-for-unsafe-enchants.patch
View File

@@ -27,7 +27,7 @@ index e639c0ec642910e66b1d68ae0b9208ef58d91fce..24c4ad919eeb9c5e15572ee32b0895c9
++i;
} else if (targets.size() == 1) {
diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
index d39b86b90aefab85b92e980f56f690bdfb9da82f..eb942aa4cea106f2cd5eaf1e55f96373fe7bea8d 100644
index 1608c1462ad7aff04530d94c1d206a550f18e625..b271879e345e0ed77c63de58af44d5f681f3fe1a 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
@@ -209,7 +209,8 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -70,10 +70,10 @@ index d39b86b90aefab85b92e980f56f690bdfb9da82f..eb942aa4cea106f2cd5eaf1e55f96373
((ServerPlayer) player).connection.send(new ClientboundContainerSetDataPacket(containerId, 0, cost.get()));
}
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 7d721cf67b688dfd05d8d847c47626de1f6f3392..7fff7d366a7f75e2fdd7e5f739976bb0fd0ba725 100644
index 6acd0002a29a698ef5f993bad28bbe8e646eed48..ee267a0e23c09e2ee4dd176ee92f571afd50271b 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1164,6 +1164,12 @@ public final class ItemStack {
@@ -1165,6 +1165,12 @@ public final class ItemStack {
return this.tag != null && this.tag.contains("Enchantments", 9) ? !this.tag.getList("Enchantments", 10).isEmpty() : false;
}