Preliminary update to 1.17.1

This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions

View File

@@ -5,17 +5,17 @@ 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 4be9924556e0f447dbe6a53c2d4cb7fb89dac455..0554261342308573551f05413a45a7592d32ca64 100644
index e61be8f9a9b26a9daa3f70ec028ed689dfd43c93..52ed8a1629ab95e52c8c391902069e2fd6f0738f 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -382,6 +382,7 @@ public final class ItemStack {
// revert back all captured blocks
@@ -381,6 +381,7 @@ public final class ItemStack {
world.preventPoiUpdated = true; // CraftBukkit - SPIGOT-5710
for (BlockState blockstate : blocks) {
blockstate.update(true, false);
+ ((CraftBlock) blockstate.getBlock()).getNMS().getBlock().forgetPlacer(); // Purpur
}
world.preventPoiUpdated = false;
// Brute force all possible updates
@@ -409,6 +410,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
@@ -25,7 +25,7 @@ index 4be9924556e0f447dbe6a53c2d4cb7fb89dac455..0554261342308573551f05413a45a759
world.notifyAndUpdatePhysics(newblockposition, null, oldBlock, block, world.getBlockState(newblockposition), updateFlag, 512); // send null chunk as chunk.k() returns false by this point
}
diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
index 99d05dbe7d7d9bcc1c5f5b3dd02e413e3a398a10..8189dbf510702e81e86ff0070d4819fac1bfef03 100644
index 0f295a496d4d94811199fa952ed68325ee1df0f6..5aab59cba33bcf4b615977dcd9261b0cf2b56aa9 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
@@ -461,7 +461,17 @@ public class Block extends BlockBehaviour implements ItemLike {