Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
James Perry 2024-09-27 08:35:25 +10:00 committed by md_5
parent 5529a1769e
commit 527041ab59
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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