diff --git a/src/com/dre/brewery/BCauldron.java b/src/com/dre/brewery/BCauldron.java index 6992e8f7..6f05dfb2 100644 --- a/src/com/dre/brewery/BCauldron.java +++ b/src/com/dre/brewery/BCauldron.java @@ -182,13 +182,12 @@ public boolean fill(Player player, Block block) { return false; } + // If the Water_Cauldron type exists and the cauldron is on last level if (LegacyUtil.WATER_CAULDRON != null && cauldron.getLevel() == 1) { // Empty Cauldron - P.p.log("Empty Cauldron"); block.setType(Material.CAULDRON); bcauldrons.remove(block); } else { - P.p.log("Setting level to : " + (cauldron.getLevel() - 1)); cauldron.setLevel(cauldron.getLevel() - 1); // Update the new Level to the Block diff --git a/src/com/dre/brewery/BDistiller.java b/src/com/dre/brewery/BDistiller.java index 191e9412..bdafa878 100644 --- a/src/com/dre/brewery/BDistiller.java +++ b/src/com/dre/brewery/BDistiller.java @@ -220,6 +220,7 @@ private boolean prepareForDistillables(BrewingStand stand) { if (P.use1_11) { // The trick below doesnt work in 1.11, but we dont need it anymore // This should only happen with older Brews that have been made with the old Potion Color System + // This causes standard potions to not brew in the brewing stand if put together with Brews, but the bubble animation will play stand.setBrewingTime(Short.MAX_VALUE); } else { // Brewing time is sent and stored as short diff --git a/src/com/dre/brewery/listeners/CauldronListener.java b/src/com/dre/brewery/listeners/CauldronListener.java index 661ab2b1..ff8ff2ec 100644 --- a/src/com/dre/brewery/listeners/CauldronListener.java +++ b/src/com/dre/brewery/listeners/CauldronListener.java @@ -29,9 +29,6 @@ public void onCauldronChange(CauldronLevelChangeEvent event) { BlockState newState = event.getNewState(); Material newType = newState.getType(); - P.p.log("OldType: " + currentType + " NewType: " + newType); - - if (currentType == Material.WATER_CAULDRON) { if (newType != Material.WATER_CAULDRON) { // Change from water to anything else @@ -43,8 +40,6 @@ public void onCauldronChange(CauldronLevelChangeEvent event) { Levelled oldCauldron = ((Levelled) event.getBlock().getBlockData()); Levelled newCauldron = ((Levelled) newState.getBlockData()); - P.p.log("OldLevel: " + oldCauldron.getLevel() + " Newlevel: " + newCauldron.getLevel()); - // Water Level increased somehow, might be Bucket, Bottle, Rain, etc. if (newCauldron.getLevel() > oldCauldron.getLevel()) { BCauldron.remove(event.getBlock()); diff --git a/src/com/dre/brewery/utility/PermissionUtil.java b/src/com/dre/brewery/utility/PermissionUtil.java index 6705dbf6..a033e1f8 100644 --- a/src/com/dre/brewery/utility/PermissionUtil.java +++ b/src/com/dre/brewery/utility/PermissionUtil.java @@ -118,6 +118,7 @@ public static int getAlcRecovery(Permissible player) { */ public static int getRangedPermission(Permissible player, String subPermission) { Optional found = player.getEffectivePermissions().stream(). + filter(PermissionAttachmentInfo::getValue). // Only active permissions filter(x -> x.getPermission().startsWith(subPermission)). findFirst();