From fc63f63de6ada7d44ab0fcd77b982ff203f19c40 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 13 Jul 2013 18:46:26 +0100 Subject: Fix local message when no players are in the area Allow any translation key to be silenced by blanking it in locale file --- .../src/com/earth2me/essentials/EssentialsPlayerListener.java | 6 +----- Essentials/src/com/earth2me/essentials/User.java | 7 +++++++ .../essentials/chat/EssentialsChatPlayerListenerNormal.java | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index c012347a5..9ae51b9e7 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -246,11 +246,7 @@ public class EssentialsPlayerListener implements Listener final List mail = user.getMails(); if (mail.isEmpty()) { - final String msg = _("noNewMail"); - if (!msg.isEmpty()) - { - user.sendMessage(msg); - } + user.sendMessage(_("noNewMail")); } else { diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 9a10b15ec..c4392eb2c 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -783,4 +783,11 @@ public class User extends UserData implements Comparable, IReplyTo, net.es { this.recipeSee = recipeSee; } + + @Override + public void sendMessage(String message) { + if (!message.isEmpty()) { + base.sendMessage(message); + } + } } diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java index 2b15a6771..82096f460 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java @@ -130,13 +130,13 @@ public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer { spyList.add(onlinePlayer); } - outList.remove(onlinePlayer); + it.remove(); } } } if (outList.size() < 2) { - event.getPlayer().sendMessage(_("localNoOne")); + user.sendMessage(_("localNoOne")); } LocalChatSpyEvent spyEvent = new LocalChatSpyEvent(event.isAsynchronous(), event.getPlayer(), event.getFormat(), event.getMessage(), spyList); -- cgit v1.2.3