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

Revert away drainAndRemove

Browse Source
This commit is contained in:
alxl 2020-11-30 01:16:31 -06:00
parent a17e5e28db
commit d3d8bfe50d
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/dre/brewery/BPlayer.java
View File

@ -182,7 +182,7 @@ public class BPlayer {
applyEffects(effects, player, PlayerEffectEvent.EffectType.DRINK); applyEffects(effects, player, PlayerEffectEvent.EffectType.DRINK);
if (brewAlc < 0) { if (brewAlc < 0) {
bPlayer.drainAndRemove(player, -brewAlc); bPlayer.drain(player, -brewAlc);
} else if (brewAlc > 0) { } else if (brewAlc > 0) {
bPlayer.drunkeness += brewAlc; bPlayer.drunkeness += brewAlc;
if (quality > 0) { if (quality > 0) {
@ -337,11 +337,7 @@ public class BPlayer {
// Eat something to drain the drunkeness // Eat something to drain the drunkeness
public void drainByItem(Player player, Material mat) { public void drainByItem(Player player, Material mat) {
int strength = BConfig.drainItems.get(mat); int strength = BConfig.drainItems.get(mat);
drainAndRemove(player, strength); if (drain(player, strength)) {
}
public void drainAndRemove(Player player, int amount) {
if (drain(player, amount)) {
remove(player); remove(player);
} }
} }