mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@c975819 Fix inconsistencies in dispense events regarding stack size (#8653) PaperMC/Paper@1c535f9 Remove deprecated event warning for inventory result event (#8672) PaperMC/Paper@66437d0 Add more breakNaturally functionality (#7379) PaperMC/Paper@7789bc5 Improve some logging and errors (#8673) PaperMC/Paper@eec64a4 Fix explosion yield with new gamerules (#8674)
This commit is contained in:
@@ -18,10 +18,10 @@ index 88c8f2c53c024021e7bad1e4666e3438b53ab588..16f136dd8ed96a3eb7ae1cf9c6039b4f
|
||||
if (itemstack1.isDamageableItem() && itemstack1.getDamageValue() != j) {
|
||||
itemstack1.setDamageValue(j);
|
||||
diff --git a/src/main/java/net/minecraft/world/item/ArmorItem.java b/src/main/java/net/minecraft/world/item/ArmorItem.java
|
||||
index 014dd3aa8a7313d978d4781a1b7c6f532ff04962..feeb5fc192da4d7b11c26abf628dc9da2c593a85 100644
|
||||
index 74838807857d32a1fc5fa9a8edb27dd8067d950c..26ed7bc8bc76b81b3cb47784de158febb5719a81 100644
|
||||
--- a/src/main/java/net/minecraft/world/item/ArmorItem.java
|
||||
+++ b/src/main/java/net/minecraft/world/item/ArmorItem.java
|
||||
@@ -145,7 +145,14 @@ public class ArmorItem extends Item implements Wearable {
|
||||
@@ -147,7 +147,14 @@ public class ArmorItem extends Item implements Wearable {
|
||||
}
|
||||
|
||||
itemstack.setCount(0);
|
||||
@@ -58,7 +58,7 @@ index 42f79d418ec4e2dbeac9a217d9dc144cda2ef714..250c0e31825f772d3fee7a523f150cb2
|
||||
return InteractionResultHolder.fail(itemStack);
|
||||
}
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
index 77399157dcdb13d6c0b50c284884d34a7fb1929a..1623936910a399a8335f4541530fe84743aaebf4 100644
|
||||
index 3cd04d8e1bf920c36fbab1968df1cb65fbcdc068..3592c0721ab50a0dff3ae6bd3c36316d88e3f57e 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
@@ -393,6 +393,8 @@ public class PurpurWorldConfig {
|
||||
|
||||
Reference in New Issue
Block a user