diff --git a/civcraft/src/com/avrgaming/civcraft/listener/PlayerListener.java b/civcraft/src/com/avrgaming/civcraft/listener/PlayerListener.java index e31fc6bad..d6b01e9b8 100644 --- a/civcraft/src/com/avrgaming/civcraft/listener/PlayerListener.java +++ b/civcraft/src/com/avrgaming/civcraft/listener/PlayerListener.java @@ -438,15 +438,21 @@ public void OnPlayerBucketEmptyEvent(PlayerBucketEmptyEvent event) { @EventHandler(priority = EventPriority.LOW) public void OnBrewEvent(BrewEvent event) { /* Hardcoded disables based on ingredients used. */ - if (event.getContents().contains(Material.SPIDER_EYE) || - event.getContents().contains(Material.GOLDEN_CARROT) || - event.getContents().contains(Material.GHAST_TEAR) || - event.getContents().contains(Material.FERMENTED_SPIDER_EYE) || - event.getContents().contains(Material.BLAZE_POWDER) || - event.getContents().contains(Material.SULPHUR)) { - event.setCancelled(true); + if (event.getContents().contains(Material.BLAZE_POWDER)) { + if (event.getContents().getItem(3).getType() == Material.BLAZE_POWDER) { + event.setCancelled(true); + return; + } } + if (event.getContents().contains(Material.SPIDER_EYE) || + event.getContents().contains(Material.GOLDEN_CARROT) || + event.getContents().contains(Material.GHAST_TEAR) || + event.getContents().contains(Material.FERMENTED_SPIDER_EYE) || + event.getContents().contains(Material.SULPHUR)) { + event.setCancelled(true); + } + if (event.getContents().contains(Material.POTION)) { ItemStack potion = event.getContents().getItem(event.getContents().first(Material.POTION));