From c730cdcecfcae836eb3e39e1841a8dd7d8c93997 Mon Sep 17 00:00:00 2001
From: Bjarne Koll <git@lynxplay.dev>
Date: Wed, 6 Dec 2023 17:39:37 +0100
Subject: [PATCH] Fix custom potion mixes patch

---
 patches/server/Custom-Potion-Mixes.patch | 38 ++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/patches/server/Custom-Potion-Mixes.patch b/patches/server/Custom-Potion-Mixes.patch
index c9cf5f8122..fb9fa0c948 100644
--- a/patches/server/Custom-Potion-Mixes.patch
+++ b/patches/server/Custom-Potion-Mixes.patch
@@ -31,6 +31,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return CraftRecipe.toIngredient(choice, true);
 +    }
 +}
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+             this.worldData.setDataConfiguration(worlddataconfiguration);
+             this.resources.managers.updateRegistryTags(this.registryAccess());
++            net.minecraft.world.item.alchemy.PotionBrewing.reload(); // Paper
+             // Paper start
+             if (Thread.currentThread() != this.serverThread) {
+                 return;
 diff --git a/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java b/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java
@@ -207,3 +219,29 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          Ingredient stack;
  
          if (bukkit == null) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
++++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
+@@ -0,0 +0,0 @@ public class CraftPotionBrewer implements PotionBrewer {
+     public PotionEffect createEffect(PotionEffectType potion, int duration, int amplifier) {
+         return new PotionEffect(potion, potion.isInstant() ? 1 : (int) (duration * potion.getDurationModifier()), amplifier);
+     }
++
++    // Paper start
++    @Override
++    public void addPotionMix(io.papermc.paper.potion.PotionMix potionMix) {
++        net.minecraft.world.item.alchemy.PotionBrewing.addPotionMix(potionMix);
++    }
++
++    @Override
++    public void removePotionMix(org.bukkit.NamespacedKey key) {
++        net.minecraft.world.item.alchemy.PotionBrewing.removePotionMix(key);
++    }
++
++    @Override
++    public void resetPotionMixes() {
++        net.minecraft.world.item.alchemy.PotionBrewing.reload();
++    }
++    // Paper end
+ }