Skip to content

Commit

Permalink
Merge branch 'dev/feature' into feature/event-leash
Browse files Browse the repository at this point in the history
  • Loading branch information
NotSoDelayed committed Dec 2, 2024
1 parent 0225659 commit 4de4de5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/ch/njol/skript/expressions/ExprUnleashReason.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.")
Expand Down

0 comments on commit 4de4de5

Please sign in to comment.