From 4de4de535b9f7aa3d7c67146be49113cc2c21f9d Mon Sep 17 00:00:00 2001 From: NotSoDelayed <72163224+NotSoDelayed@users.noreply.github.com> Date: Mon, 2 Dec 2024 20:28:11 +0800 Subject: [PATCH] Merge branch 'dev/feature' into feature/event-leash --- .../ch/njol/skript/classes/data/BukkitClasses.java | 2 +- .../ch/njol/skript/expressions/ExprUnleashReason.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java b/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java index c937b04d634..d12c11a6ea6 100644 --- a/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java +++ b/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java @@ -1533,7 +1533,7 @@ public String toVariableNameString(EnchantmentOffer eo) { Classes.registerClass(new EnumClassInfo<>(EntityUnleashEvent.UnleashReason.class, "unleashreason", "unleash reasons") .user("unleash ?(reason|cause)s?") .name("Unleash Reason") - .description("Represents an unleash reason of an unleash event.") + .description("Represents an unleash reason of an unleash event.")); Classes.registerClass(new EnumClassInfo<>(EntityPotionEffectEvent.Cause.class, "entitypotioncause", "entity potion causes") .user("(entity )?potion ?effect ?cause") diff --git a/src/main/java/ch/njol/skript/expressions/ExprUnleashReason.java b/src/main/java/ch/njol/skript/expressions/ExprUnleashReason.java index cc07ca86abd..904f4ac3c82 100644 --- a/src/main/java/ch/njol/skript/expressions/ExprUnleashReason.java +++ b/src/main/java/ch/njol/skript/expressions/ExprUnleashReason.java @@ -1,5 +1,10 @@ package ch.njol.skript.expressions; +import org.bukkit.event.Event; +import org.bukkit.event.entity.EntityUnleashEvent; +import org.bukkit.event.entity.EntityUnleashEvent.UnleashReason; +import org.jetbrains.annotations.Nullable; + import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Events; @@ -11,11 +16,6 @@ import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import ch.njol.util.coll.CollectionUtils; -import org.bukkit.event.Event; -import org.bukkit.event.entity.EntityUnleashEvent; -import org.bukkit.event.entity.EntityUnleashEvent.UnleashReason; -import org.eclipse.jdt.annotation.Nullable; @Name("Unleash Reason") @Description("The unleash reason in an unleash event.")