From bac16238ac56f8f724b257e410c7e52d72dd50a3 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sat, 14 Sep 2024 15:19:13 -0700
Subject: [PATCH] Fix NPE for Alchemy Fixes #5080 Fixes #5073

---
 .../nossr50/runnables/skills/AlchemyBrewTask.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java
index 9592e7894..7c83514fe 100644
--- a/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java
@@ -152,11 +152,16 @@ public class AlchemyBrewTask extends CancellableRunnable {
 
 
     private void finish() {
-        final McMMOPlayerBrewEvent event = new McMMOPlayerBrewEvent(mmoPlayer, brewingStand);
-        mcMMO.p.getServer().getPluginManager().callEvent(event);
+        if (mmoPlayer == null) {
+            // Still need to finish brewing if the player is null
+            AlchemyPotionBrewer.finishBrewing(brewingStand, null, false);
+        } else {
+            final McMMOPlayerBrewEvent event = new McMMOPlayerBrewEvent(mmoPlayer, brewingStand);
+            mcMMO.p.getServer().getPluginManager().callEvent(event);
 
-        if (!event.isCancelled()) {
-            AlchemyPotionBrewer.finishBrewing(brewingStand, mmoPlayer, false);
+            if (!event.isCancelled()) {
+                AlchemyPotionBrewer.finishBrewing(brewingStand, mmoPlayer, false);
+            }
         }
 
         Alchemy.brewingStandMap.remove(brewingStand.getLocation());