diff --git a/resources/config/v12/de/config.yml b/resources/config/v12/de/config.yml index deab55c..6988a3b 100644 --- a/resources/config/v12/de/config.yml +++ b/resources/config/v12/de/config.yml @@ -440,6 +440,7 @@ recipes: cookingtime: 2 color: BLACK difficulty: 3 + alcohol: -6 lore: + &8Bestimmt schon eine Woche alt effects: - REGENERATION/1/2-5 diff --git a/resources/config/v12/fr/config.yml b/resources/config/v12/fr/config.yml index cda1846..8624d5b 100644 --- a/resources/config/v12/fr/config.yml +++ b/resources/config/v12/fr/config.yml @@ -438,6 +438,7 @@ recipes: cookingtime: 2 color: BLACK difficulty: 3 + alcohol: -6 effects: - REGENERATION/1/2-5 - SPEED/1/30-140 diff --git a/resources/config/v12/it/config.yml b/resources/config/v12/it/config.yml index 7fe51f3..1025bba 100644 --- a/resources/config/v12/it/config.yml +++ b/resources/config/v12/it/config.yml @@ -429,6 +429,7 @@ recipes: cookingtime: 2 color: BLACK difficulty: 3 + alcohol: -6 effects: - REGENERATION/1/2-5 - SPEED/1/30-140 diff --git a/resources/config/v13/de/config.yml b/resources/config/v13/de/config.yml index 418cb2d..ad47398 100644 --- a/resources/config/v13/de/config.yml +++ b/resources/config/v13/de/config.yml @@ -740,6 +740,7 @@ recipes: cookingtime: 2 color: BLACK difficulty: 3 + alcohol: -6 lore: + &8Bestimmt schon eine Woche alt effects: - REGENERATION/1/2-5 @@ -844,7 +845,7 @@ recipes: # Pumpkin Spice Bier, # Melonen Vodka -# Es gibt noch viele Minecraft Items wie Ranken und items von anderen plugins die sich gut als Zutaten machen würden +# Es gibt noch viele Minecraft Items wie Ranken, Milch und items von anderen plugins die sich gut als Zutaten machen würden diff --git a/resources/config/v13/en/config.yml b/resources/config/v13/en/config.yml index c5ece20..219297a 100644 --- a/resources/config/v13/en/config.yml +++ b/resources/config/v13/en/config.yml @@ -840,7 +840,7 @@ recipes: # Pumpkin Spice Beer, # Melon Vodka -# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients. +# There are a lot of items in Minecraft like Vines, Milk and items added by plugins that would make great ingredients. # -- Plugin Compatibility -- diff --git a/resources/config/v13/es/config.yml b/resources/config/v13/es/config.yml index 13f8f44..4732918 100644 --- a/resources/config/v13/es/config.yml +++ b/resources/config/v13/es/config.yml @@ -840,7 +840,7 @@ recipes: # Pumpkin Spice Beer, # Melon Vodka -# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients. +# There are a lot of items in Minecraft like Vines, Milk and items added by plugins that would make great ingredients. # -- Plugin Compatibility -- diff --git a/resources/config/v13/fr/config.yml b/resources/config/v13/fr/config.yml index 303f891..6e22d9c 100644 --- a/resources/config/v13/fr/config.yml +++ b/resources/config/v13/fr/config.yml @@ -846,7 +846,7 @@ recipes: # Pumpkin Spice Beer, # Melon Vodka -# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients. +# There are a lot of items in Minecraft like Vines, Milk and items added by plugins that would make great ingredients. # -- Compatibilité entre Plugins -- diff --git a/resources/config/v13/it/config.yml b/resources/config/v13/it/config.yml index 45c6de2..4225794 100644 --- a/resources/config/v13/it/config.yml +++ b/resources/config/v13/it/config.yml @@ -739,6 +739,7 @@ recipes: cookingtime: 2 color: BLACK difficulty: 3 + alcohol: -6 lore: + &8Probably a week old effects: - REGENERATION/1/2-5 @@ -839,7 +840,7 @@ eggnog: # Pumpkin Spice Beer, # Melon Vodka -# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients. +# There are a lot of items in Minecraft like Vines, Milk and items added by plugins that would make great ingredients. # -- Compatibilità con altri plugin -- diff --git a/resources/config/v13/zh/config.yml b/resources/config/v13/zh/config.yml index 4d7304c..834937b 100644 --- a/resources/config/v13/zh/config.yml +++ b/resources/config/v13/zh/config.yml @@ -743,6 +743,7 @@ recipes: cookingtime: 2 color: BLACK difficulty: 3 + alcohol: -6 lore: + &8Probably a week old effects: - REGENERATION/1/2-5 @@ -820,7 +821,7 @@ recipes: # cookingtime: 1 # color: BLACK # difficulty: 4 - # alcohol: -6 + # alcohol: -8 # effects: # - REGENERATION/30 # - SPEED/10 @@ -843,7 +844,7 @@ recipes: # Pumpkin Spice Beer, # Melon Vodka -# There are a lot of items in Minecraft like Vines and items added by plugins that would make great ingredients. +# There are a lot of items in Minecraft like Vines, Milk and items added by plugins that would make great ingredients. # -- 插件兼容性 -- diff --git a/src/com/dre/brewery/BPlayer.java b/src/com/dre/brewery/BPlayer.java index 3ab2323..9c63c2a 100644 --- a/src/com/dre/brewery/BPlayer.java +++ b/src/com/dre/brewery/BPlayer.java @@ -182,6 +182,7 @@ public class BPlayer { applyEffects(effects, player, PlayerEffectEvent.EffectType.DRINK); if (brewAlc < 0) { + // If the Drink has negative alcohol, drain some alcohol bPlayer.drain(player, -brewAlc); } else if (brewAlc > 0) { bPlayer.drunkeness += brewAlc; @@ -190,21 +191,25 @@ public class BPlayer { } else { bPlayer.quality += brewAlc; } - + applyEffects(getQualityEffects(quality, brewAlc), player, PlayerEffectEvent.EffectType.QUALITY); } - + if (bPlayer.drunkeness > 100) { bPlayer.drinkCap(player); } - bPlayer.syncToSQL(false); - + if (BConfig.showStatusOnDrink) { - bPlayer.showDrunkeness(player); + // Only show the Player his drunkeness if he is already drunk, or this drink changed his drunkeness + if (brewAlc != 0 || bPlayer.drunkeness > 0) { + bPlayer.showDrunkeness(player); + } } if (bPlayer.drunkeness <= 0) { bPlayer.remove(); + } else { + bPlayer.syncToSQL(false); } return true; }