@@ -20,7 +20,7 @@ public class EvtByReflection extends SelfRegisteringSkriptEvent {
2020
2121 static {
2222 Skript .registerEvent ("Bukkit" , EvtByReflection .class , BukkitEvent .class ,
23- "[(1¦all)] %javatypes% [(at|on|with) priority <.+>] " );
23+ "[(1¦all)] %javatypes%" );
2424 }
2525
2626 private static class MyEventExecutor implements EventExecutor {
@@ -67,7 +67,6 @@ public void setCancelled(boolean cancel) {
6767 }
6868
6969 private Class <? extends Event >[] classes ;
70- private EventPriority priority ;
7170 private boolean ignoreCancelled ;
7271 private Listener listener ;
7372
@@ -90,18 +89,6 @@ public boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.ParseRes
9089 classes [i ] = (Class <? extends Event >) clazz ;
9190 }
9291
93- if (parseResult .regexes .size () > 0 ) {
94- String priorityName = parseResult .regexes .get (0 ).group ().toUpperCase ();
95- try {
96- priority = EventPriority .valueOf (priorityName );
97- } catch (IllegalArgumentException ex ) {
98- Skript .error (priorityName + " is not a valid priority level" );
99- return false ;
100- }
101- } else {
102- priority = SkriptConfig .defaultEventPriority .value ();
103- }
104-
10592 ignoreCancelled = (parseResult .mark & 1 ) != 1 ;
10693
10794 listener = new Listener () {};
@@ -115,7 +102,7 @@ public void register(Trigger t) {
115102 EventExecutor executor = new MyEventExecutor (eventClass , t );
116103
117104 Bukkit .getPluginManager ()
118- .registerEvent (eventClass , listener , priority , executor , SkriptMirror .getInstance (), ignoreCancelled );
105+ .registerEvent (eventClass , listener , getEventPriority () , executor , SkriptMirror .getInstance (), ignoreCancelled );
119106 }
120107 }
121108
@@ -129,13 +116,17 @@ public void unregisterAll() {
129116 HandlerList .unregisterAll (listener );
130117 }
131118
119+ @ Override
120+ public boolean isEventPrioritySupported () {
121+ return true ;
122+ }
123+
132124 @ Override
133125 public String toString (Event e , boolean debug ) {
134126 return (ignoreCancelled ? "all " : "" )
135127 + Arrays .stream (classes )
136128 .map (Class ::getSimpleName )
137- .collect (Collectors .joining (", " ))
138- + " with priority " + priority ;
129+ .collect (Collectors .joining (", " ));
139130 }
140131
141132}
0 commit comments