32 lines
1.8 KiB
Diff
32 lines
1.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||
|
|
Date: Sat, 8 Sep 2018 18:43:31 -0500
|
||
|
|
Subject: [PATCH] Allow chests to be placed with NBT data
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||
|
|
index 79a7c37f15840dbd97510874ac12437d2b854999..02bfa4fb8055e60a84e878ffbf18303c0ee25b1d 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||
|
|
@@ -296,6 +296,7 @@ public final class ItemStack {
|
||
|
|
enuminteractionresult = InteractionResult.FAIL; // cancel placement
|
||
|
|
// PAIL: Remove this when MC-99075 fixed
|
||
|
|
placeEvent.getPlayer().updateInventory();
|
||
|
|
+ world.capturedTileEntities.clear(); // Paper - clear out tile entities as chests and such will pop loot
|
||
|
|
// revert back all captured blocks
|
||
|
|
for (BlockState blockstate : blocks) {
|
||
|
|
blockstate.update(true, false);
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
|
||
|
|
index 17289d28b6d0023279a573715ee3d182988dd651..ab11c7a5a397047a35245b149d77bf035e718a0c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
|
||
|
|
@@ -326,7 +326,7 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity { // Pape
|
||
|
|
// CraftBukkit start
|
||
|
|
@Override
|
||
|
|
public boolean onlyOpCanSetNbt() {
|
||
|
|
- return true;
|
||
|
|
+ return false; // Paper
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
}
|