Upstream/Brewery
1
0
Fork 1
mirror of https://github.com/DieReicheErethons/Brewery.git synced 2025-02-10 00:11:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Return empty buckets when using as ingredient

Browse Source
This commit is contained in:
Sn0wStorm 2014-05-06 23:41:01 +02:00
parent cb773a3662
commit 31385edce5
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/dre/brewery/listeners/PlayerListener.java
View File

@ -73,12 +73,23 @@ public class PlayerListener implements Listener {
// contitions // contitions
} else if (BIngredients.possibleIngredients.contains(materialInHand)) { } else if (BIngredients.possibleIngredients.contains(materialInHand)) {
if (BCauldron.ingredientAdd(clickedBlock, materialInHand)) { if (BCauldron.ingredientAdd(clickedBlock, materialInHand)) {
boolean isBucket = item.getType().equals(Material.WATER_BUCKET)
|| item.getType().equals(Material.LAVA_BUCKET)
|| item.getType().equals(Material.MILK_BUCKET);
if (item.getAmount() > 1) { if (item.getAmount() > 1) {
item.setAmount(item.getAmount() - 1); item.setAmount(item.getAmount() - 1);
if (isBucket) {
BCauldron.giveItem(player, new ItemStack(Material.BUCKET));
}
} else {
if (isBucket) {
player.setItemInHand(new ItemStack(Material.BUCKET));
} else { } else {
player.setItemInHand(new ItemStack(0)); player.setItemInHand(new ItemStack(0));
} }
} }
}
event.setCancelled(true); event.setCancelled(true);
} else { } else {
event.setCancelled(true); event.setCancelled(true);