Make SpellEffect events cancellable

Author: Malfrador

papyrus-api/src/main/java/de/erethon/spellbook/api/SpellCaster.java

@@ -72,14 +72,16 @@ default void tick() {
         while(effectIterator.hasNext()) {
             SpellEffect effect = effectIterator.next();
             if (effect.shouldRemove()) {
+                SpellEffectRemoveEvent event = new SpellEffectRemoveEvent(effect.caster, effect, effect.data, RemovalReason.EXPIRED);
+                event.callEvent();
+                if (event.isCancelled()) {
+                    return;
+                }
                 effect.onRemove();
                 effectIterator.remove();
                 for (SpellEffect eventEffect: getEffects()) {
                     eventEffect.onRemoveEffect(effect);
-                }
-                SpellEffectRemoveEvent event = new SpellEffectRemoveEvent(effect.caster, effect, effect.data, RemovalReason.EXPIRED);
-                Bukkit.getPluginManager().callEvent(event);
-            } else {
+                }} else {
                 effect.tick();
             }
         }
@@ -155,37 +157,45 @@ default void addEffect(LivingEntity caster, EffectData data, int duration, int s
         if (hasEffect(data)) {
             SpellEffect oldEffect = getEffects().stream().filter(e -> e.data.equals(data)).findFirst().get();
             if (oldEffect.canAdd(duration, stacks)) {
+                SpellEffectAddEvent event = new SpellEffectAddEvent(this, oldEffect, data, true);
+                event.callEvent();
+                if (event.isCancelled()) {
+                    return;
+                }
                 if (!onEffectAdd(oldEffect, false)) {
                     return;
                 }
                 oldEffect.add(duration, stacks);
-                SpellEffectAddEvent event = new SpellEffectAddEvent(this, oldEffect, data, true);
-                Bukkit.getPluginManager().callEvent(event);
             }
         } else {
             SpellEffect effect = data.getActiveEffect(caster, (LivingEntity) this, duration, stacks);
+            SpellEffectAddEvent event = new SpellEffectAddEvent(this, effect, data, false);
+            event.callEvent();
+            if (event.isCancelled()) {
+                return;
+            }
             if (!onEffectAdd(effect, true)) {
                 return;
             }
             getEffects().add(effect);
-            effect.onApply();
-            SpellEffectAddEvent event = new SpellEffectAddEvent(this, effect, data, false);
-            Bukkit.getPluginManager().callEvent(event);
-        }
+            effect.onApply();}
     }
 
     default void removeEffect(EffectData effect) {
         Iterator<SpellEffect> iterator = getEffects().iterator();
         while (iterator.hasNext()) {
             SpellEffect itr = iterator.next();
             if (itr.data == effect) {
+                SpellEffectRemoveEvent event = new SpellEffectRemoveEvent(this, itr, effect, RemovalReason.CLEANSED);
+                event.callEvent();
+                if (event.isCancelled()) {
+                    continue;
+                }
                 if (!onEffectRemove(itr)) {
                     continue;
                 }
                 iterator.remove();
                 onEffectRemove(itr);
-                SpellEffectRemoveEvent event = new SpellEffectRemoveEvent(this, itr, effect, RemovalReason.CLEANSED);
-                Bukkit.getPluginManager().callEvent(event);
             }
         }
     }

papyrus-api/src/main/java/de/erethon/spellbook/api/SpellEffectAddEvent.java

@@ -1,15 +1,17 @@
 package de.erethon.spellbook.api;
 
+import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
-public class SpellEffectAddEvent extends Event {
+public class SpellEffectAddEvent extends Event implements Cancellable {
 
     private final SpellCaster target;
     private final SpellEffect effect;
     private final EffectData data;
     private final boolean isExtension;
+    private boolean cancelled = false;
 
     public SpellEffectAddEvent(SpellCaster target, SpellEffect activeSpell, EffectData data, boolean isExtension) {
         this.target = target;
@@ -45,4 +47,13 @@ public boolean wasExtended() {
         return handlers;
     }
 
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        cancelled = cancel;
+    }
 }

papyrus-api/src/main/java/de/erethon/spellbook/api/SpellEffectRemoveEvent.java

@@ -1,6 +1,7 @@
 package de.erethon.spellbook.api;
 
 import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
@@ -9,12 +10,13 @@ enum RemovalReason {
     EXPIRED,
     CLEANSED
 }
-public class SpellEffectRemoveEvent extends Event {
+public class SpellEffectRemoveEvent extends Event implements Cancellable {
 
     private final SpellCaster target;
     private final SpellEffect effect;
     private final EffectData data;
     private final RemovalReason reason;
+    private boolean cancelled = false;
 
     public SpellEffectRemoveEvent(SpellCaster target, SpellEffect activeSpell, EffectData data, RemovalReason removalReason) {
         this.target = target;
@@ -50,4 +52,15 @@ public RemovalReason getReason() {
         return handlers;
     }
 
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        cancelled = cancel;
+    }
+
 }