From e792779dd8d8ba06d6448ca34bdd98da1daed481 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 16 Jul 2025 22:00:54 +0200 Subject: [PATCH] Allow AreaEffectCloud#setColor to reset color for null (#12760) --- .../src/main/java/org/bukkit/entity/AreaEffectCloud.java | 4 ++-- .../org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/paper-api/src/main/java/org/bukkit/entity/AreaEffectCloud.java index de77a3d665d..c2645b4f06b 100644 --- a/paper-api/src/main/java/org/bukkit/entity/AreaEffectCloud.java +++ b/paper-api/src/main/java/org/bukkit/entity/AreaEffectCloud.java @@ -241,9 +241,9 @@ public interface AreaEffectCloud extends Entity { /** * Sets the color of this cloud. Will be applied as a tint to its particles. * - * @param color cloud color + * @param color cloud color or {@code null} to reset to default */ - void setColor(@NotNull Color color); + void setColor(@Nullable Color color); /** * Retrieve the original source of this cloud. diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java index aa5afe124ae..5a73f8e1e32 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java @@ -128,7 +128,7 @@ public class CraftAreaEffectCloud extends CraftEntity implements AreaEffectCloud @Override public void setColor(Color color) { PotionContents old = this.getHandle().potionContents; - this.getHandle().setPotionContents(new PotionContents(old.potion(), Optional.of(color.asRGB()), old.customEffects(), old.customName())); + this.getHandle().setPotionContents(new PotionContents(old.potion(), Optional.ofNullable(color).map(Color::asRGB), old.customEffects(), old.customName())); } @Override