From b6271a3554217268f248793759e8b9828126cb80 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Mon, 12 Jun 2023 21:02:46 +1000 Subject: [PATCH] Fix another mistake in previous commits causing server crash By: md_5 --- .../java/org/bukkit/craftbukkit/event/CraftEventFactory.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index 222a92eb85..18345c4bb5 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1611,8 +1611,7 @@ public class CraftEventFactory { PotionEffect bukkitOldEffect = (oldEffect == null) ? null : CraftPotionUtil.toBukkit(oldEffect); PotionEffect bukkitNewEffect = (newEffect == null) ? null : CraftPotionUtil.toBukkit(newEffect); - Preconditions.checkState(bukkitOldEffect != null, "Old and new potion is null"); - Preconditions.checkState(bukkitNewEffect != null, "New potion effect is null"); + Preconditions.checkState(bukkitOldEffect != null || bukkitNewEffect != null, "Old and new potion effect are both null"); EntityPotionEffectEvent event = new EntityPotionEffectEvent((LivingEntity) entity.getBukkitEntity(), bukkitOldEffect, bukkitNewEffect, cause, action, willOverride); Bukkit.getPluginManager().callEvent(event);