Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-10-17 17:05:20 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into release

Browse Source
This commit is contained in:
snowleo 2011-07-21 02:52:25 +02:00
commit 6ccb60813a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java
View File

@ -52,11 +52,12 @@ public class EssentialsChatPlayerListener extends PlayerListener
event.setFormat(ess.getSettings().getChatFormat(user.getGroup()).replace('&', '§').replace("§§", "&").replace("{DISPLAYNAME}", "%1$s").replace("{GROUP}", user.getGroup()).replace("{MESSAGE}", "%2$s").replace("{WORLDNAME}", user.getWorld().getName()).replace("{SHORTWORLDNAME}", user.getWorld().getName().substring(0, 1).toUpperCase())); event.setFormat(ess.getSettings().getChatFormat(user.getGroup()).replace('&', '§').replace("§§", "&").replace("{DISPLAYNAME}", "%1$s").replace("{GROUP}", user.getGroup()).replace("{MESSAGE}", "%2$s").replace("{WORLDNAME}", user.getWorld().getName()).replace("{SHORTWORLDNAME}", user.getWorld().getName().substring(0, 1).toUpperCase()));
final int radius = ess.getSettings().getChatRadius(); long radius = ess.getSettings().getChatRadius();
if (radius < 1) if (radius < 1)
{ {
return; return;
} }
radius *= radius;
if (event.getMessage().startsWith("!") && event.getMessage().length() > 1) if (event.getMessage().startsWith("!") && event.getMessage().length() > 1)
{ {
@ -100,13 +101,13 @@ public class EssentialsChatPlayerListener extends PlayerListener
{ {
continue; continue;
} }
if (!u.equals(user) && !u.isAuthorized("essentials.chat.spy")) if (!u.isAuthorized("essentials.chat.spy"))
{ {
final Location l = u.getLocation(); final Location l = u.getLocation();
final int dx = Math.abs(x - l.getBlockX()); final int dx = x - l.getBlockX();
final int dy = Math.abs(y - l.getBlockY()); final int dy = y - l.getBlockY();
final int dz = Math.abs(z - l.getBlockZ()); final int dz = z - l.getBlockZ();
final int delta = dx + dy + dz; final long delta = dx*dx + dy*dy + dz*dz;
if (delta > radius || world != l.getWorld()) if (delta > radius || world != l.getWorld())
{ {
continue; continue;