From d25e1e7225293d463b679d6daf84712a61c9f643 Mon Sep 17 00:00:00 2001
From: Miles Holder <mwholder@proton.me>
Date: Wed, 25 Sep 2024 07:52:14 +1000
Subject: [PATCH] #1481: Fix BeaconView#set[X]Effect(null)

---
 .../bukkit/craftbukkit/inventory/view/CraftBeaconView.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftBeaconView.java b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftBeaconView.java
index 4deedd619..d79300262 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftBeaconView.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftBeaconView.java
@@ -35,11 +35,11 @@ public class CraftBeaconView extends CraftInventoryView<ContainerBeacon> impleme
 
     @Override
     public void setPrimaryEffect(@Nullable final PotionEffectType effectType) {
-        container.setData(TileEntityBeacon.DATA_PRIMARY, ContainerBeacon.encodeEffect(CraftPotionEffectType.bukkitToMinecraftHolder(effectType)));
+        container.setData(TileEntityBeacon.DATA_PRIMARY, ContainerBeacon.encodeEffect((effectType == null) ? null : CraftPotionEffectType.bukkitToMinecraftHolder(effectType)));
     }
 
     @Override
     public void setSecondaryEffect(@Nullable final PotionEffectType effectType) {
-        container.setData(TileEntityBeacon.DATA_SECONDARY, ContainerBeacon.encodeEffect(CraftPotionEffectType.bukkitToMinecraftHolder(effectType)));
+        container.setData(TileEntityBeacon.DATA_SECONDARY, ContainerBeacon.encodeEffect((effectType == null) ? null : CraftPotionEffectType.bukkitToMinecraftHolder(effectType)));
     }
 }