From 8114729e1635f362175ffb9dbf8a45700f4bd673 Mon Sep 17 00:00:00 2001
From: TheBusyBiscuit <mrCookieSlime@gmail.com>
Date: Fri, 31 Dec 2021 18:29:21 +0100
Subject: [PATCH] Fixed #3390

---
 CHANGELOG.md                                          | 11 +++++++++++
 .../items/electric/machines/AutoBrewer.java           | 10 ++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aff2a15f1..4cb598588 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Table of contents
+- [Release Candidate 31 (TBD)](#release-candidate-31-tbd)
 - [Release Candidate 30 (31 Dec 2021)](#release-candidate-30-31-dec-2021)
 - [Release Candidate 29 (07 Nov 2021)](#release-candidate-29-07-nov-2021)
 - [Release Candidate 28 (06 Sep 2021)](#release-candidate-28-06-sep-2021)
@@ -30,7 +31,17 @@
 - [Release Candidate 2 (29 Sep 2019)](#release-candidate-2-29-sep-2019)
 - [Release Candidate 1 (26 Sep 2019)](#release-candidate-1-26-sep-2019)
 
+## Release Candidate 31 (TBD)
+
+#### Additions
+
+#### Changes
+
+#### Fixes
+* Fixed #3390
+
 ## Release Candidate 30 (31 Dec 2021)
+https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#30
 
 #### Additions
 * Added a ton of wiki links to the guide
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoBrewer.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoBrewer.java
index fe98f4036..f00676edd 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoBrewer.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoBrewer.java
@@ -126,11 +126,13 @@ public class AutoBrewer extends AContainer implements NotHopperable {
                 potion.setBasePotionData(new PotionData(fermented, data.isExtended(), data.isUpgraded()));
                 return new ItemStack(potionType);
             }
-        } else if (input == Material.REDSTONE && type.isExtendable()) {
-            potion.setBasePotionData(new PotionData(type, true, data.isUpgraded()));
+        } else if (input == Material.REDSTONE && type.isExtendable() && !data.isUpgraded()) {
+            // Fixes #3390 - Potions can only be either extended or upgraded. Not both.
+            potion.setBasePotionData(new PotionData(type, true, false));
             return new ItemStack(potionType);
-        } else if (input == Material.GLOWSTONE_DUST && type.isUpgradeable()) {
-            potion.setBasePotionData(new PotionData(type, data.isExtended(), true));
+        } else if (input == Material.GLOWSTONE_DUST && type.isUpgradeable() && !data.isExtended()) {
+            // Fixes #3390 - Potions can only be either extended or upgraded. Not both.
+            potion.setBasePotionData(new PotionData(type, false, true));
             return new ItemStack(potionType);
         } else if (type == PotionType.AWKWARD) {
             PotionType potionRecipe = potionRecipes.get(input);