OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-20 07:34:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-7902, #1477: Fix CraftMetaPotion#hasCustomEffects() does not check if customEffects (List) is empty

Browse source 
By: James Perry <beanp02@yahoo.com>
This commit is contained in:
CraftBukkit/Spigot 2024-09-27 08:35:25 +10:00
parent 060be9b96a
commit 074c4c011e
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
View file

@ -115,6 +115,10 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta {
void applyToItem(CraftMetaItem.Applicator tag) { void applyToItem(CraftMetaItem.Applicator tag) {
super.applyToItem(tag); super.applyToItem(tag);
if (isPotionEmpty()) {
return;
}
Optional<Holder<PotionRegistry>> defaultPotion = (hasBasePotionType()) ? Optional.of(CraftPotionType.bukkitToMinecraftHolder(type)) : Optional.empty(); Optional<Holder<PotionRegistry>> defaultPotion = (hasBasePotionType()) ? Optional.of(CraftPotionType.bukkitToMinecraftHolder(type)) : Optional.empty();
Optional<Integer> potionColor = (hasColor()) ? Optional.of(this.color.asRGB()) : Optional.empty(); Optional<Integer> potionColor = (hasColor()) ? Optional.of(this.color.asRGB()) : Optional.empty();
@ -174,7 +178,7 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta {
@Override @Override
public boolean hasCustomEffects() { public boolean hasCustomEffects() {
return customEffects != null; return customEffects != null && !customEffects.isEmpty();
} }
@Override @Override