Dont throw if setting too large inv contents

This commit is contained in:
William Blake Galbreath
2019-08-16 22:27:10 -05:00
parent 61ec2b76b1
commit dc53da5130

View File

@@ -1,4 +1,4 @@
From 72e755e41aec1b220824dc3eb2190752537881d9 Mon Sep 17 00:00:00 2001
From 51e2b79efa6673374fcf4d6ebc5052eb8f8b8342 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 23 Jun 2019 17:01:26 -0500
Subject: [PATCH] Add large sized ender chests
@@ -8,7 +8,8 @@ Subject: [PATCH] Add large sized ender chests
src/main/java/net/minecraft/server/InventoryEnderChest.java | 2 +-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 6 ++++++
.../org/bukkit/craftbukkit/inventory/CraftContainer.java | 4 +++-
4 files changed, 11 insertions(+), 2 deletions(-)
.../org/bukkit/craftbukkit/inventory/CraftInventory.java | 2 +-
5 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java
index 4b7290238..fc5227683 100644
@@ -74,6 +75,19 @@ index 631d39967..47c7013f0 100644
break;
case BARREL:
delegate = new ContainerChest(net.pl3x.purpur.PurpurConfig.packedBarrels ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
index 026a0c399..d2c06cff2 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
@@ -81,7 +81,7 @@ public class CraftInventory implements Inventory {
@Override
public void setContents(ItemStack[] items) {
- if (getSize() < items.length) {
+ if (false && getSize() < items.length) { // Purpur
throw new IllegalArgumentException("Invalid inventory size; expected " + getSize() + " or less");
}
--
2.20.1
2.23.0.rc1