From 1cc08404d1136abfcdcb566f229db600699aac86 Mon Sep 17 00:00:00 2001 From: Ayham Al-Ali <20037329+AyhamAl-Ali@users.noreply.github.com> Date: Fri, 5 Apr 2024 19:00:36 +0300 Subject: [PATCH] Update toString --- .../java/ch/njol/skript/effects/EffEnchant.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/ch/njol/skript/effects/EffEnchant.java b/src/main/java/ch/njol/skript/effects/EffEnchant.java index 2659217e3f0..1c712e5165a 100644 --- a/src/main/java/ch/njol/skript/effects/EffEnchant.java +++ b/src/main/java/ch/njol/skript/effects/EffEnchant.java @@ -51,6 +51,7 @@ }) @Since("2.0, INSERT VERSION (store, specific disenchant)") public class EffEnchant extends Effect { + static { Skript.registerEffect(EffEnchant.class, "enchant %~itemtypes% with %enchantmenttypes%", @@ -84,7 +85,7 @@ public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelaye @Override protected void execute(Event event) { ItemType[] items = this.items.getArray(event); - if (items.length < 1) + if (items.length == 0) // shortcut return; EnchantmentType[] types = null; @@ -94,7 +95,7 @@ protected void execute(Event event) { return; types = enchantments.getArray(event); - if (types.length < 1) + if (types.length == 0) // shortcut return; } @@ -130,11 +131,13 @@ protected void execute(Event event) { @Override public String toString(@Nullable Event event, boolean debug) { - if (enchantments == null) { - return "disenchant " + (isStored ? "stored " + (isSpecificDisenchant ? enchantments.toString(event, debug) : - "enchantments") + " of " : "") + items.toString(event, debug) + (!isStored && isSpecificDisenchant ? " of " + - enchantments.toString(event, debug) : ""); - return "enchant " + items.toString(event, debug) + " with " + (isStored ? "stored " : "") + enchantments; + if (isDisenchant) { + if (isStored) + return "unstore " + (isSpecificDisenchant ? enchantments.toString(event, debug) : "enchantments") + " of " + items.toString(event, debug); + else + return "disenchant " + items.toString(event, debug) + " from " + (isSpecificDisenchant ? enchantments.toString(event, debug) : "enchantments"); + } + return (isStored ? "store " : "enchant ") + items.toString(event, debug) + (isStored ? " on " : " with ") + enchantments; } }