Updated Upstream (Paper)

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

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Store placer on Block when placed
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 7fff7d366a7f75e2fdd7e5f739976bb0fd0ba725..ceac1de7dedf5702f2eb49e489790d24490722db 100644
index ee267a0e23c09e2ee4dd176ee92f571afd50271b..6a1bf2e4f6241a405f0c7d7e0d6b6f57082160ff 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -412,6 +412,7 @@ public final class ItemStack {
@@ -413,6 +413,7 @@ public final class ItemStack {
world.preventPoiUpdated = true; // CraftBukkit - SPIGOT-5710
for (BlockState blockstate : blocks) {
blockstate.update(true, false);
@@ -16,7 +16,7 @@ index 7fff7d366a7f75e2fdd7e5f739976bb0fd0ba725..ceac1de7dedf5702f2eb49e489790d24
}
world.preventPoiUpdated = false;
@@ -441,6 +442,7 @@ public final class ItemStack {
@@ -442,6 +443,7 @@ public final class ItemStack {
if (!(block.getBlock() instanceof BaseEntityBlock)) { // Containers get placed automatically
block.getBlock().onPlace(block, world, newblockposition, oldBlock, true, itemactioncontext); // Paper - pass itemactioncontext
}