Skip to content

Commit 520e34f

Browse files
authored
Merge pull request #30 from MultiChat/version-1.6.1
Version 1.6.1
2 parents dd84948 + bd5463c commit 520e34f

34 files changed

Lines changed: 1323 additions & 53 deletions

multichat/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>xyz.olivermartin.multichat</groupId>
66
<artifactId>multichat</artifactId>
7-
<version>1.6</version>
7+
<version>1.6.1</version>
88

99
<repositories>
1010

151 KB
Binary file not shown.
151 KB
Binary file not shown.
153 KB
Binary file not shown.
157 KB
Binary file not shown.
157 KB
Binary file not shown.
163 KB
Binary file not shown.
163 KB
Binary file not shown.

multichat/src/main/java/xyz/olivermartin/multichat/bungee/Announcements.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.md_5.bungee.api.chat.TextComponent;
1010
import net.md_5.bungee.api.connection.ProxiedPlayer;
1111
import net.md_5.bungee.api.scheduler.ScheduledTask;
12+
import xyz.olivermartin.multichat.bungee.events.PostBroadcastEvent;
1213

1314
/**
1415
* Announcements Management
@@ -33,12 +34,15 @@ public static boolean startAnnouncement(final String name, Integer minutes) {
3334
@Override
3435
public void run() {
3536
String message = announcements.get(name.toLowerCase());
36-
37+
3738
message = ChatControl.applyChatRules(message, "announcements", "").get();
3839

3940
for (ProxiedPlayer onlineplayer : ProxyServer.getInstance().getPlayers()) {
4041
onlineplayer.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&',message)));
4142
}
43+
44+
// Trigger PostBroadcastEvent
45+
ProxyServer.getInstance().getPluginManager().callEvent(new PostBroadcastEvent("announcement", message));
4246
}
4347

4448
}, 0, minutes, TimeUnit.MINUTES);
@@ -124,12 +128,15 @@ public static void playAnnouncement(String name) {
124128
if (announcements.containsKey(name.toLowerCase())) {
125129

126130
String message = announcements.get(name.toLowerCase());
127-
131+
128132
message = ChatControl.applyChatRules(message, "announcements", "").get();
129133

130134
for (ProxiedPlayer onlineplayer : ProxyServer.getInstance().getPlayers()) {
131135
onlineplayer.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&',message)));
132136
}
137+
138+
// Trigger PostBroadcastEvent
139+
ProxyServer.getInstance().getPluginManager().callEvent(new PostBroadcastEvent("announcement", message));
133140

134141
}
135142
}

multichat/src/main/java/xyz/olivermartin/multichat/bungee/Bulletins.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.md_5.bungee.api.chat.TextComponent;
1010
import net.md_5.bungee.api.connection.ProxiedPlayer;
1111
import net.md_5.bungee.api.scheduler.ScheduledTask;
12+
import xyz.olivermartin.multichat.bungee.events.PostBroadcastEvent;
1213

1314
/**
1415
* Bulletins Management
@@ -106,12 +107,15 @@ public void run() {
106107
} else {
107108

108109
message = bulletin.get(nextBulletin);
109-
110+
110111
message = ChatControl.applyChatRules(message, "bulletins", "").get();
111112

112113
for (ProxiedPlayer onlineplayer : ProxyServer.getInstance().getPlayers()) {
113114
onlineplayer.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&',message)));
114115
}
116+
117+
// Trigger PostBroadcastEvent
118+
ProxyServer.getInstance().getPluginManager().callEvent(new PostBroadcastEvent("bulletin", message));
115119

116120
}
117121

0 commit comments

Comments
 (0)