mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Allow AreaEffectCloud#setColor to reset color for null (#12760)

Browse source
This commit is contained in:
David 2025-07-16 22:00:54 +02:00 • committed by GitHub
parent a6e0c08fdf
commit e792779dd8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
paper-api/src/main/java/org/bukkit/entity/AreaEffectCloud.java
View file

@ -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.

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java
View file

@ -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