From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 27 May 2021 04:04:23 -0500 Subject: [PATCH] ShulkerBox allow oversized stacks This fixes PaperMC/Paper#4748 where breaking a shulkerbox in survival mode with oversized itemstacks would cause a "chunk ban". This fixes it by always creating an itemstack using the TileEntity's NBT data (how it handles it for creative players) instead of routing it through the LootableBuilder. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java index 1351d83efdcab51d3898e1fb77d01b27975ce136..a6bf1fb6fff72b7d6460ce27ee7e7c45d4f4fee4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -445,7 +445,7 @@ public class ServerPlayerGameMode { block.destroy(this.level, pos, iblockdata); } - if (this.isCreative()) { + if (this.isCreative() || (this.level.purpurConfig.shulkerBoxAllowOversizedStacks && block instanceof net.minecraft.world.level.block.ShulkerBoxBlock)) { // Purpur // return true; // CraftBukkit } else { ItemStack itemstack = this.player.getMainHandItem(); diff --git a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java index 7f1230d915c98b6f30b13a06c2788bc2f7b7e912..9439119a70a411b1a7d9cd6a0090e4133ac744a3 100644 --- a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java +++ b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java @@ -123,7 +123,7 @@ public class ShulkerBoxBlock extends BaseEntityBlock { BlockEntity blockEntity = world.getBlockEntity(pos); if (blockEntity instanceof ShulkerBoxBlockEntity) { ShulkerBoxBlockEntity shulkerBoxBlockEntity = (ShulkerBoxBlockEntity)blockEntity; - if (!world.isClientSide && player.isCreative() && !shulkerBoxBlockEntity.isEmpty()) { + if (world.purpurConfig.shulkerBoxAllowOversizedStacks || (player.isCreative() && !shulkerBoxBlockEntity.isEmpty())) { // Purpur ItemStack itemStack = getColoredItemStack(this.getColor()); blockEntity.saveToItem(itemStack); if (shulkerBoxBlockEntity.hasCustomName()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java index f24c209ebde321504219661219bd9fe8d40acf52..20e55ccaf40f289b4bd028c4c6fc8b78748f7cf1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -672,6 +672,11 @@ public class PurpurWorldConfig { } } + public boolean shulkerBoxAllowOversizedStacks = false; + private void shulkerBoxSettings() { + shulkerBoxAllowOversizedStacks = getBoolean("blocks.shulker_box.allow-oversized-stacks", shulkerBoxAllowOversizedStacks); + } + public boolean signAllowColors = false; public boolean signRightClickEdit = false; private void signSettings() {