Implements BroadcastMessageEvent (GlowstoneMC#922)

VaiTon · Dec 17, 2018 · 761e468 · 761e468
1 parent facae66
commit 761e468
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/main/java/net/glowstone/GlowServer.java b/src/main/java/net/glowstone/GlowServer.java
@@ -194,6 +194,7 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.event.server.BroadcastMessageEvent;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
 import org.bukkit.help.HelpMap;
@@ -2135,13 +2136,21 @@ public int broadcastMessage(String message) {
     @Override
     public int broadcast(String message, String permission) {
         int count = 0;
+        Set<CommandSender> sent = new HashSet<>();
         for (Permissible permissible : getPluginManager().getPermissionSubscriptions(permission)) {
             if (permissible instanceof CommandSender && permissible.hasPermission(permission)) {
-                ((CommandSender) permissible).sendMessage(message);
-                ++count;
+                CommandSender cs = ((CommandSender) permissible);
+                sent.add(cs);
             }
         }
-        return count;
+        BroadcastMessageEvent event = EventFactory.getInstance()
+            .callEvent(new BroadcastMessageEvent(message, sent));
+        if (event.isCancelled()) {
+            return 0;
+        }
+
+        sent.forEach(cs -> cs.sendMessage(message));
+        return sent.size();
     }
 
     @Override