Skip to content

Commit 4c40868

Browse files
committed
Update ItemData.java
1 parent d84ae43 commit 4c40868

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

src/main/java/ch/njol/skript/aliases/ItemData.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -659,31 +659,31 @@ public ItemData aliasCopy() {
659659

660660
private static void copyPotionInfo(PotionMeta potionMeta, ItemData data) {
661661
PotionMeta newMeta = (PotionMeta) itemFactory.getItemMeta(data.type);
662-
if (!newMeta.equals(potionMeta)) {
663-
// copy potion meta info
664-
if (potionMeta.hasBasePotionType())
665-
newMeta.setBasePotionType(potionMeta.getBasePotionType());
666-
if (potionMeta.hasCustomEffects()) {
667-
for (PotionEffect effect : potionMeta.getCustomEffects()) {
668-
newMeta.addCustomEffect(effect, false);
669-
}
662+
if (newMeta.equals(potionMeta))
663+
return;
664+
// copy potion meta info
665+
if (potionMeta.hasBasePotionType())
666+
newMeta.setBasePotionType(potionMeta.getBasePotionType());
667+
if (potionMeta.hasCustomEffects()) {
668+
for (PotionEffect effect : potionMeta.getCustomEffects()) {
669+
newMeta.addCustomEffect(effect, false);
670670
}
671-
if (potionMeta.hasColor())
672-
newMeta.setColor(potionMeta.getColor());
673-
if (HAS_CUSTOM_NAME && potionMeta.hasCustomPotionName())
674-
newMeta.setCustomPotionName(potionMeta.getCustomPotionName());
675-
data.itemFlags = ItemFlags.CHANGED_TAGS;
676-
data.setItemMeta(newMeta);
677671
}
672+
if (potionMeta.hasColor())
673+
newMeta.setColor(potionMeta.getColor());
674+
if (HAS_CUSTOM_NAME && potionMeta.hasCustomPotionName())
675+
newMeta.setCustomPotionName(potionMeta.getCustomPotionName());
676+
data.itemFlags = ItemFlags.CHANGED_TAGS;
677+
data.setItemMeta(newMeta);
678678
}
679679

680680
private static void copyMusicInfo(MusicInstrumentMeta musicMeta, ItemData data) {
681681
MusicInstrumentMeta newMeta = (MusicInstrumentMeta) itemFactory.getItemMeta(data.type);
682-
if (!newMeta.equals(musicMeta)) {
683-
newMeta.setInstrument(musicMeta.getInstrument());
684-
data.itemFlags = ItemFlags.CHANGED_TAGS;
685-
data.setItemMeta(newMeta);
686-
}
682+
if (newMeta.equals(musicMeta))
683+
return;
684+
newMeta.setInstrument(musicMeta.getInstrument());
685+
data.itemFlags = ItemFlags.CHANGED_TAGS;
686+
data.setItemMeta(newMeta);
687687
}
688688

689689
/**

0 commit comments

Comments
 (0)