Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-09-18 19:11:03 +02:00
Code Issues Projects Releases Wiki Activity

Allow new lines and add secure broadcast keywords.

Browse Source
This commit is contained in:
KHobbits 2013-06-16 01:18:35 +01:00
parent aa6d85eacc
commit 8fb91c5a61
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@ -619,29 +619,29 @@ public class Essentials extends JavaPlugin implements IEssentials
@Override @Override
public int broadcastMessage(final String message) public int broadcastMessage(final String message)
{ {
return broadcastMessage(null, null, message); return broadcastMessage(null, null, message, true);
} }
@Override @Override
public int broadcastMessage(final IUser sender, final String message) public int broadcastMessage(final IUser sender, final String message)
{ {
return broadcastMessage(sender, null, message); return broadcastMessage(sender, null, message, false);
} }
@Override @Override
public int broadcastMessage(final String permission, final String message) public int broadcastMessage(final String permission, final String message)
{ {
return broadcastMessage(null, permission, message); return broadcastMessage(null, permission, message, false);
} }
private int broadcastMessage(final IUser sender, final String permission, final String message) private int broadcastMessage(final IUser sender, final String permission, final String message, final boolean keywords)
{ {
if (sender != null && sender.isHidden()) if (sender != null && sender.isHidden())
{ {
return 0; return 0;
} }
final IText input = new SimpleTextInput(message); IText broadcast = new SimpleTextInput(message);
final Player[] players = getServer().getOnlinePlayers(); final Player[] players = getServer().getOnlinePlayers();
@ -651,8 +651,11 @@ public class Essentials extends JavaPlugin implements IEssentials
if ((permission == null && (sender == null || !user.isIgnoredPlayer(sender))) if ((permission == null && (sender == null || !user.isIgnoredPlayer(sender)))
|| (permission != null && user.isAuthorized(permission))) || (permission != null && user.isAuthorized(permission)))
{ {
final IText output = new KeywordReplacer(input, player, this, false); if (keywords)
for (String messageText : output.getLines()) {
broadcast = new KeywordReplacer(broadcast, player, this, false);
}
for (String messageText : broadcast.getLines())
{ {
player.sendMessage(messageText); player.sendMessage(messageText);
} }

2
Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java
View File

@ -33,6 +33,6 @@ public class Commandbroadcast extends EssentialsCommand
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
ess.broadcastMessage(_("broadcast", FormatUtil.replaceFormat(getFinalArg(args, 0)), name)); ess.broadcastMessage(_("broadcast", FormatUtil.replaceFormat(getFinalArg(args, 0)).replace("\\n", "\n"), name));
} }
} }