Entity Potion Effect Event

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

@@ -59,6 +59,7 @@
 import org.bukkit.entity.Projectile;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityPotionEffectEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.EntityTransformEvent.TransformReason;
 import org.bukkit.event.inventory.ClickType;
@@ -1548,6 +1549,11 @@ public String toVariableNameString(EnchantmentOffer eo) {
 				.name("Transform Reason")
 				.description("Represents a transform reason of an <a href='events.html#entity transform'>entity transform event</a>.")
 				.since("2.8.0"));
+		Classes.registerClass(new EnumClassInfo<>(EntityPotionEffectEvent.Cause.class, "entitypotioncause", "entity potion causes")
+				.user("[entity] potion effect cause")
+				.name("Entity Potion Cause")
+				.description("Represents the cause of the action of a potion effect on an entity, e.g. arrow, command")
+				.since("INSERT VERSION"));
 	}
 
 }

src/main/java/ch/njol/skript/events/EvtEntityPotion.java

@@ -22,7 +22,7 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptEvent;
-import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
 import org.bukkit.event.Event;
 import org.bukkit.event.entity.EntityPotionEffectEvent;
 import org.bukkit.potion.PotionEffectType;
@@ -33,7 +33,7 @@ public class EvtEntityPotion extends SkriptEvent {
 
 	static {
 		Skript.registerEvent("Entity Potion Effect", EvtEntityPotion.class, EntityPotionEffectEvent.class,
-				"entity potion effect [modif[y|ication]] [[of] %potioneffecttypes%]")
+				"entity potion effect [modif[y|ication]] [[of] %potioneffecttypes%] [due to %entitypotioncause%]")
 			.description("Called when an entity's potion effect is modified.", "This modification can include adding, removing or changing their potion effect.")
 			.examples(
 				"on entity potion effect modification:",
@@ -47,7 +47,7 @@ public class EvtEntityPotion extends SkriptEvent {
 	private Expression<PotionEffectType> potionEffects;
 
 	@Override
-	public boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.ParseResult parseResult) {
+	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
 		if (args.length > 0) {
 			potionEffects = (Expression<PotionEffectType>) args[0];
 		}
@@ -57,22 +57,26 @@ public boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.ParseRes
 
 	@Override
 	public boolean check(Event event) {
-		if (event instanceof EntityPotionEffectEvent) {
-			EntityPotionEffectEvent potionEvent = (EntityPotionEffectEvent) event;
-			if (potionEffects != null && potionEvent.getNewEffect() != null) {
-				PotionEffectType effectType = potionEvent.getNewEffect().getType();
-				for (PotionEffectType potionEffectType : potionEffects.getArray(event)) {
-					if (potionEffectType.equals(effectType)) {
-						return true;
-					}
-				}
-			} else {
+		if (!(event instanceof EntityPotionEffectEvent)) {
+			return false;
+		}
+
+		EntityPotionEffectEvent potionEvent = (EntityPotionEffectEvent) event;
+		if (potionEffects == null || potionEvent.getNewEffect() == null) {
+			return false;
+		}
+
+		PotionEffectType effectType = potionEvent.getNewEffect().getType();
+		for (PotionEffectType potionEffectType : potionEffects.getArray(event)) {
+			if (potionEffectType.equals(effectType)) {
 				return true;
 			}
 		}
+
 		return false;
 	}
 
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return "on entity potion effect modification";