TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-07-31 18:01:42 +00:00
Code Issues Projects Releases Wiki Activity

Revert to 1013

Browse source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1021 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-03-30 12:56:34 +00:00
parent 81c9b91561
commit 08041599ff
44 changed files with 2273 additions and 867 deletions
Download patch file Download diff file Expand all files Collapse all files

7
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java
View file

@ -2,7 +2,10 @@ package com.earth2me.essentials.chat;
import com.earth2me.essentials.Essentials;
import org.bukkit.Server;
import org.bukkit.event.player.*;
import org.bukkit.event.player.PlayerChatEvent;
import org.bukkit.event.player.PlayerEvent;
import org.bukkit.event.player.PlayerListener;
import org.bukkit.event.player.PlayerRespawnEvent;
public class EssentialsChatPlayerListener extends PlayerListener
@ -16,7 +19,7 @@ public class EssentialsChatPlayerListener extends PlayerListener
@Override
@SuppressWarnings("CallToThreadDumpStack")
public void onPlayerJoin(PlayerJoinEvent event)
public void onPlayerJoin(PlayerEvent event)
{
try
{

15
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatWorker.java
View file

@ -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"))