From b9f901af660ebad7ca72ec726893dfb310910703 Mon Sep 17 00:00:00 2001 From: Jikoo Date: Fri, 19 Jul 2019 07:18:23 -0400 Subject: [PATCH] Add silent barrels - fixes #106 --- .../internal/v1_14_R1/AnySilentContainer.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 379762d..72cc991 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 @@ -21,6 +21,7 @@ import java.lang.reflect.Field; import javax.annotation.Nullable; import net.minecraft.server.v1_14_R1.AxisAlignedBB; import net.minecraft.server.v1_14_R1.Block; +import net.minecraft.server.v1_14_R1.BlockBarrel; import net.minecraft.server.v1_14_R1.BlockChest; import net.minecraft.server.v1_14_R1.BlockChestTrapped; import net.minecraft.server.v1_14_R1.BlockEnderChest; @@ -78,7 +79,8 @@ public class AnySilentContainer implements IAnySilentContainer { } BlockState state = bukkitBlock.getState(); return state instanceof org.bukkit.block.Chest - || state instanceof org.bukkit.block.ShulkerBox; + || state instanceof org.bukkit.block.ShulkerBox + || state instanceof org.bukkit.block.Barrel; } @Override @@ -258,6 +260,10 @@ public class AnySilentContainer implements IAnySilentContainer { bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED); } + if (block instanceof BlockBarrel) { + bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL); + } + // AnyChest only - SilentChest not active, container unsupported, or unnecessary. if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) { player.openContainer(tileInventory); @@ -284,9 +290,10 @@ public class AnySilentContainer implements IAnySilentContainer { InventoryView view = bukkitPlayer.getOpenInventory(); switch (view.getType()) { - case CHEST: - case ENDER_CHEST: - case SHULKER_BOX: + case CHEST: + case ENDER_CHEST: + case SHULKER_BOX: + case BARREL: break; default: return;