From 18f63085bbcac05243beb263bfe0514051ba8bf8 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Wed, 25 Sep 2024 07:52:14 +1000 Subject: [PATCH] #1481: Fix BeaconView#set[X]Effect(null) By: Miles Holder --- .../bukkit/craftbukkit/inventory/view/CraftBeaconView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftBeaconView.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftBeaconView.java index 4deedd619..d79300262 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftBeaconView.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftBeaconView.java @@ -35,11 +35,11 @@ public class CraftBeaconView extends CraftInventoryView 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))); } }