mirror of
https://github.com/essentials/Essentials.git
synced 2025-10-03 09:31:57 +02:00
Revert to 1013
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1021 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
@@ -52,20 +52,15 @@ public class EssentialsChatWorker
|
||||
|
||||
public static void onPlayerChat(Server server, PlayerChatEvent event)
|
||||
{
|
||||
if (event.isCancelled()) return;
|
||||
User user = User.get(event.getPlayer());
|
||||
updateDisplayName(user);
|
||||
|
||||
if (user.isAuthorized("essentials.chat.color"))
|
||||
event.setMessage(event.getMessage().replaceAll("&([0-9a-f])", "§$1"));
|
||||
|
||||
event.setFormat(Essentials.getSettings().getChatFormat(user.getGroup())
|
||||
.replace('&', '§')
|
||||
.replace("§§", "&")
|
||||
.replace("{DISPLAYNAME}", "%1$s")
|
||||
.replace("{GROUP}", user.getGroup())
|
||||
.replace("{MESSAGE}", "%2$s")
|
||||
.replace("{WORLDNAME}", user.getWorld().getName()));
|
||||
|
||||
|
||||
event.setFormat(Essentials.getSettings().getChatFormat(user.getGroup()).replace('&', '§').replace("§§", "&").replace("{DISPLAYNAME}", "%1$s").replace("{GROUP}", user.getGroup()).replace("{MESSAGE}", "%2$s").replace("{WORLDNAME}", user.getWorld().getName()));
|
||||
|
||||
int radius = Essentials.getSettings().getChatRadius();
|
||||
if (radius < 1) return;
|
||||
|
||||
@@ -81,7 +76,7 @@ public class EssentialsChatWorker
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (event.getMessage().startsWith("?") && event.getMessage().length() > 1)
|
||||
{
|
||||
if (user.isAuthorized("essentials.chat.question"))
|
||||
|
Reference in New Issue
Block a user