Fix WrappedEvent expressions using wrong event

Author: TPGamesNL

src/main/java/com/btk5h/skriptmirror/WrappedEvent.java

@@ -14,10 +14,6 @@ protected WrappedEvent(Event event, boolean isAsynchronous) {
     this.event = event;
   }
 
-  public Event getEvent() {
-    return event instanceof WrappedEvent ? ((WrappedEvent) event).getEvent() : event;
-  }
-
   public Event getDirectEvent() {
     return event;
   }

src/main/java/com/btk5h/skriptmirror/skript/custom/ExprRawExpression.java

@@ -56,7 +56,7 @@ public void change(Event event, Object[] delta, Changer.ChangeMode changeMode) {
       return;
     Expression<?> source = expr.getSource();
 
-    event = ((WrappedEvent) event).getEvent();
+    event = ((WrappedEvent) event).getDirectEvent();
     source.change(event, delta, changeMode);
   }
 

src/main/java/com/btk5h/skriptmirror/skript/custom/event/ExprCustomEventValue.java

@@ -64,7 +64,7 @@ public T[] get(Event event) {
     if (event instanceof BukkitCustomEvent) {
       bukkitCustomEvent = (BukkitCustomEvent) event;
     } else {
-      bukkitCustomEvent = (BukkitCustomEvent) ((EventTriggerEvent) event).getEvent();
+      bukkitCustomEvent = (BukkitCustomEvent) ((EventTriggerEvent) event).getDirectEvent();
     }
 
     T[] tArray = (T[]) Array.newInstance(classInfo.getC(), 1);

src/main/java/com/btk5h/skriptmirror/skript/custom/event/ExprEventData.java

@@ -38,7 +38,7 @@ protected Object[] get(Event e) {
     if (e instanceof BukkitCustomEvent) {
       bukkitCustomEvent = (BukkitCustomEvent) e;
     } else {
-      bukkitCustomEvent = (BukkitCustomEvent) ((EventTriggerEvent) e).getEvent();
+      bukkitCustomEvent = (BukkitCustomEvent) ((EventTriggerEvent) e).getDirectEvent();
     }
 
     if (dataIndex.isSingle()) {

src/main/java/com/btk5h/skriptmirror/skript/custom/event/ExprReplacedEventValue.java

@@ -33,7 +33,7 @@ protected T[] get(final Event e) {
       if (e instanceof BukkitCustomEvent) {
         bukkitCustomEvent = (BukkitCustomEvent) e;
       } else {
-        bukkitCustomEvent = (BukkitCustomEvent) ((EventTriggerEvent) e).getEvent();
+        bukkitCustomEvent = (BukkitCustomEvent) ((EventTriggerEvent) e).getDirectEvent();
       }
 
       Class<?> valueClass = original.getReturnType();

src/main/java/com/btk5h/skriptmirror/skript/reflect/EvtByReflection.java

@@ -93,13 +93,13 @@ public HandlerList getHandlers() {
 
     @Override
     public boolean isCancelled() {
-      Event event = getEvent();
-      return getEvent() instanceof Cancellable && ((Cancellable) event).isCancelled();
+      Event event = getDirectEvent();
+      return event instanceof Cancellable && ((Cancellable) event).isCancelled();
     }
 
     @Override
     public void setCancelled(boolean cancel) {
-      Event event = getEvent();
+      Event event = getDirectEvent();
       if (event instanceof Cancellable) {
         ((Cancellable) event).setCancelled(cancel);
       }
@@ -155,7 +155,7 @@ public boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.ParseRes
   @Override
   public boolean check(Event e) {
     BukkitEvent bukkitEvent = (BukkitEvent) e;
-    Event extractedEvent = bukkitEvent.getEvent();
+    Event extractedEvent = bukkitEvent.getDirectEvent();
     Class<? extends Event> eventClass = extractedEvent.getClass();
 
     if (ignoreCancelled && extractedEvent instanceof Cancellable && ((Cancellable) extractedEvent).isCancelled())

src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprEvent.java

@@ -17,7 +17,7 @@ public class ExprEvent extends SimpleExpression<Event> {
   @Override
   protected Event[] get(Event e) {
     if (e instanceof WrappedEvent) {
-      return new Event[]{((WrappedEvent) e).getEvent()};
+      return new Event[]{((WrappedEvent) e).getDirectEvent()};
     }
     return new Event[]{e};
   }