File tree Expand file tree Collapse file tree
src/main/java/com/laytonsmith Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -259,7 +259,7 @@ public void Startup(CommandHelperPlugin chp) {
259259 chp .registerEventsDynamic (EntityListener );
260260 chp .registerEventsDynamic (InventoryListener );
261261 chp .registerEvents (PlayerListener );
262- chp .registerEvents (ServerListener );
262+ chp .registerEventsDynamic (ServerListener );
263263 chp .registerEvents (VehicleListener );
264264 chp .registerEvents (WeatherListener );
265265 chp .registerEvents (WorldListener );
Original file line number Diff line number Diff line change 1010
1111import org .bukkit .command .CommandSender ;
1212import org .bukkit .entity .Player ;
13+ import org .bukkit .event .Event ;
1314import org .bukkit .event .server .BroadcastMessageEvent ;
1415import org .bukkit .event .server .ServerCommandEvent ;
1516import org .bukkit .event .server .ServerListPingEvent ;
@@ -133,8 +134,8 @@ public static class BukkitMCBroadcastMessageEvent implements MCBroadcastMessageE
133134
134135 private final BroadcastMessageEvent bme ;
135136
136- public BukkitMCBroadcastMessageEvent (BroadcastMessageEvent event ) {
137- this .bme = event ;
137+ public BukkitMCBroadcastMessageEvent (Event event ) {
138+ this .bme = ( BroadcastMessageEvent ) event ;
138139 }
139140
140141 @ Override
Original file line number Diff line number Diff line change 44import com .laytonsmith .abstraction .bukkit .BukkitMCLocation ;
55import com .laytonsmith .abstraction .bukkit .events .BukkitServerEvents ;
66import com .laytonsmith .abstraction .events .MCRedstoneChangedEvent ;
7+ import com .laytonsmith .annotations .EventIdentifier ;
78import com .laytonsmith .core .events .Driver ;
89import com .laytonsmith .core .events .EventUtils ;
910import com .laytonsmith .core .events .drivers .ServerEvents ;
1011import java .util .Map ;
12+
13+ import org .bukkit .event .Event ;
1114import org .bukkit .event .EventHandler ;
1215import org .bukkit .event .EventPriority ;
1316import org .bukkit .event .Listener ;
1417import org .bukkit .event .block .BlockPhysicsEvent ;
15- import org .bukkit .event .server .BroadcastMessageEvent ;
1618import org .bukkit .event .server .ServerListPingEvent ;
1719
1820public class BukkitServerListener implements Listener {
@@ -59,8 +61,8 @@ public Object _GetObject() {
5961 }
6062 }
6163
62- @ EventHandler ( priority = EventPriority . LOWEST )
63- public void onBroadcast (BroadcastMessageEvent event ) {
64+ @ EventIdentifier ( event = Driver . BROADCAST_MESSAGE , className = "org.bukkit.event.server.BroadcastMessageEvent" )
65+ public void onBroadcast (Event event ) {
6466 EventUtils .TriggerListener (Driver .BROADCAST_MESSAGE , "broadcast_message" ,
6567 new BukkitServerEvents .BukkitMCBroadcastMessageEvent (event ));
6668 }
Original file line number Diff line number Diff line change @@ -101,7 +101,7 @@ public enum Driver {
101101 */
102102 SERVER_COMMAND ,
103103 SERVER_PING ,
104- BROADCAST_MESSAGE ,
104+ BROADCAST_MESSAGE ( MCVersion . MC1_12 ) ,
105105 /**
106106 * Vehicle events
107107 */
You can’t perform that action at this time.
0 commit comments