From d3d8bfe50d747bbab0782cb1c77bc5293d7a98fd Mon Sep 17 00:00:00 2001
From: alxl <doomcookiealex@gmail.com>
Date: Mon, 30 Nov 2020 01:16:31 -0600
Subject: [PATCH] Revert away drainAndRemove

---
 src/com/dre/brewery/BPlayer.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/com/dre/brewery/BPlayer.java b/src/com/dre/brewery/BPlayer.java
index bca2f80..3ab2323 100644
--- a/src/com/dre/brewery/BPlayer.java
+++ b/src/com/dre/brewery/BPlayer.java
@@ -182,7 +182,7 @@ public class BPlayer {
 
 		applyEffects(effects, player, PlayerEffectEvent.EffectType.DRINK);
 		if (brewAlc < 0) {
-			bPlayer.drainAndRemove(player, -brewAlc);
+			bPlayer.drain(player, -brewAlc);
 		} else if (brewAlc > 0) {
 			bPlayer.drunkeness += brewAlc;
 			if (quality > 0) {
@@ -337,11 +337,7 @@ public class BPlayer {
 	// Eat something to drain the drunkeness
 	public void drainByItem(Player player, Material mat) {
 		int strength = BConfig.drainItems.get(mat);
-		drainAndRemove(player, strength);
-	}
-
-	public void drainAndRemove(Player player, int amount) {
-		if (drain(player, amount)) {
+		if (drain(player, strength)) {
 			remove(player);
 		}
 	}