Skip to content

Commit f3dd494

Browse files
committed
Dynamically register broadcast_message if it exists
1 parent 09684e1 commit f3dd494

4 files changed

Lines changed: 10 additions & 7 deletions

File tree

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitConvertor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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);

src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitServerEvents.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import org.bukkit.command.CommandSender;
1212
import org.bukkit.entity.Player;
13+
import org.bukkit.event.Event;
1314
import org.bukkit.event.server.BroadcastMessageEvent;
1415
import org.bukkit.event.server.ServerCommandEvent;
1516
import 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

src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitServerListener.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
import com.laytonsmith.abstraction.bukkit.BukkitMCLocation;
55
import com.laytonsmith.abstraction.bukkit.events.BukkitServerEvents;
66
import com.laytonsmith.abstraction.events.MCRedstoneChangedEvent;
7+
import com.laytonsmith.annotations.EventIdentifier;
78
import com.laytonsmith.core.events.Driver;
89
import com.laytonsmith.core.events.EventUtils;
910
import com.laytonsmith.core.events.drivers.ServerEvents;
1011
import java.util.Map;
12+
13+
import org.bukkit.event.Event;
1114
import org.bukkit.event.EventHandler;
1215
import org.bukkit.event.EventPriority;
1316
import org.bukkit.event.Listener;
1417
import org.bukkit.event.block.BlockPhysicsEvent;
15-
import org.bukkit.event.server.BroadcastMessageEvent;
1618
import org.bukkit.event.server.ServerListPingEvent;
1719

1820
public 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
}

src/main/java/com/laytonsmith/core/events/Driver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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
*/

0 commit comments

Comments
 (0)