From 855a8196cf88f06726356771e313b32ecf6fecd1 Mon Sep 17 00:00:00 2001
From: Bjarne Koll <lynxplay101@gmail.com>
Date: Wed, 6 Dec 2023 17:39:37 +0100
Subject: [PATCH] Fix custom potion mixes patch

---
 patches/server/0771-Custom-Potion-Mixes.patch | 38 +++++++++++++++++++
 ...n-on-world-create-while-being-ticked.patch |  2 +-
 ...ix-plugin-loggers-on-server-shutdown.patch |  2 +-
 patches/server/0922-Optimize-Hoppers.patch    |  2 +-
 ...Folia-scheduler-and-owned-region-API.patch |  2 +-
 5 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/patches/server/0771-Custom-Potion-Mixes.patch b/patches/server/0771-Custom-Potion-Mixes.patch
index 62ab0b8e7..0ac2d2b3e 100644
--- a/patches/server/0771-Custom-Potion-Mixes.patch
+++ b/patches/server/0771-Custom-Potion-Mixes.patch
@@ -31,6 +31,18 @@ index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d
 +        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 752e2b122c41e513aee590699c6d4624bbbfc12a..fe0a9bd0161ec6098a5f295322cc0c8d51e3ab10 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -2227,6 +2227,7 @@ 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 ad012400d76c263bf26cfa07e2e24f26dc32276b..82311188348d673d83b70bf4d5357ecee562b6d6 100644
 --- a/src/main/java/net/minecraft/world/inventory/BrewingStandMenu.java
@@ -207,3 +219,29 @@ index 28fac26aa8e4da52f3e5d8e5e0d2e2731bcf74e1..13d25d118eb4d3ef35a4cdfb9bbde9ed
          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 09ac71b6b41c757832792d9ea8ac9288f8a7404f..2909a2736a0c9d863c7ab01e0ec259f7952080cc 100644
+--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
++++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionBrewer.java
+@@ -28,4 +28,21 @@ 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
+ }
diff --git a/patches/server/0813-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0813-Throw-exception-on-world-create-while-being-ticked.patch
index 633a31ff7..cfa06457d 100644
--- a/patches/server/0813-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0813-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,7 +7,7 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 752e2b122c41e513aee590699c6d4624bbbfc12a..00de78e06b4583880e00f57823a4929eb1484e7a 100644
+index fe0a9bd0161ec6098a5f295322cc0c8d51e3ab10..84ba0e4235dde7da392bb5548358b218fb2f8bdf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -310,6 +310,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0841-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0841-Fix-plugin-loggers-on-server-shutdown.patch
index 5dc623a78..bd745f94b 100644
--- a/patches/server/0841-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0841-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 00de78e06b4583880e00f57823a4929eb1484e7a..92468b925a742b8e4ab741c39677fb3656f8481b 100644
+index 84ba0e4235dde7da392bb5548358b218fb2f8bdf..04cdfbe1d892a7f49a3c1451be5ceb2ce8c7c23a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1026,6 +1026,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0922-Optimize-Hoppers.patch b/patches/server/0922-Optimize-Hoppers.patch
index ab1d2d8d0..54fb8cfce 100644
--- a/patches/server/0922-Optimize-Hoppers.patch
+++ b/patches/server/0922-Optimize-Hoppers.patch
@@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..5c42823726e70ce6c9d0121d07431548
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 92468b925a742b8e4ab741c39677fb3656f8481b..69f21266bb0a7c42ba4e12b71acf12a4ee99bd1a 100644
+index 04cdfbe1d892a7f49a3c1451be5ceb2ce8c7c23a..9c2f9a2cee29c69e18ccfaf64a50c7efc8ad3d81 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1678,6 +1678,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0973-Folia-scheduler-and-owned-region-API.patch b/patches/server/0973-Folia-scheduler-and-owned-region-API.patch
index 69958ec48..4506ec51d 100644
--- a/patches/server/0973-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0973-Folia-scheduler-and-owned-region-API.patch
@@ -1121,7 +1121,7 @@ index 0000000000000000000000000000000000000000..d306f911757a4d556c82c0070d4837db
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 69f21266bb0a7c42ba4e12b71acf12a4ee99bd1a..2a122872ebe3d079db5170bb49b0614c30c5df4f 100644
+index 9c2f9a2cee29c69e18ccfaf64a50c7efc8ad3d81..e7bcb076788cefa94b70e455bef1f9653cec6415 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1635,6 +1635,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa