From f2e4c8a3ad7fe6c656cde1517816a635384896a0 Mon Sep 17 00:00:00 2001 From: Jikoo Date: Fri, 19 Jul 2019 16:24:58 -0400 Subject: [PATCH] Fix barrel triggering AnyContainer (#108) --- .../lishid/openinv/internal/v1_14_R1/AnySilentContainer.java | 4 ++++ .../openinv/internal/v1_14_R1/SpecialPlayerInventory.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java b/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java index 72cc991..74728f9 100644 --- a/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java +++ b/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/AnySilentContainer.java @@ -85,6 +85,10 @@ public class AnySilentContainer implements IAnySilentContainer { @Override public boolean isAnyContainerNeeded(@NotNull final Player p, @NotNull final org.bukkit.block.Block bukkitBlock) { + if (bukkitBlock.getType() == Material.BARREL) { + return false; + } + EntityPlayer player = PlayerDataManager.getHandle(p); World world = player.world; BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ()); diff --git a/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/SpecialPlayerInventory.java b/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/SpecialPlayerInventory.java index f4be998..e81b99c 100644 --- a/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/SpecialPlayerInventory.java +++ b/internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/SpecialPlayerInventory.java @@ -57,7 +57,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP private boolean playerOnline; private EntityHuman player; private NonNullList items, armor, extraSlots; - private final List> f; + private List> f; public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); @@ -83,6 +83,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP this.items = this.player.inventory.items; this.armor = this.player.inventory.armor; this.extraSlots = this.player.inventory.extraSlots; + this.f = ImmutableList.of(this.items, this.armor, this.extraSlots); this.playerOnline = true; } }