Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Prevent errors in listeners affecting EssentialsChat

This commit is contained in:
snowleo 2012-08-07 16:03:12 +02:00
parent 322fe386f6
commit 54133cd75e
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
View File

@ -6,6 +6,7 @@ import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.Location;
import org.bukkit.Server;
@ -46,11 +47,25 @@ public abstract class EssentialsChatPlayer implements Listener
}
synchronized (listeners)
{
for (IEssentialsChatListener listener : listeners.values())
for (Map.Entry<String, IEssentialsChatListener> listener : listeners.entrySet())
{
if (listener.shouldHandleThisChat(event))
try
{
return true;
if (listener.getValue().shouldHandleThisChat(event))
{
return true;
}
}
catch (Throwable t)
{
if (ess.getSettings().isDebug())
{
logger.log(Level.WARNING, "Error with EssentialsChat listener of " + listener.getKey() + ": " + t.getMessage(), t);
}
else
{
logger.log(Level.WARNING, "Error with EssentialsChat listener of " + listener.getKey() + ": " + t.getMessage());
}
}
}
}
@ -160,9 +175,23 @@ public abstract class EssentialsChatPlayer implements Listener
String message = String.format(event.getFormat(), type.concat(sender.getDisplayName()), event.getMessage());
synchronized (listeners)
{
for (IEssentialsChatListener listener : listeners.values())
for (Map.Entry<String, IEssentialsChatListener> listener : listeners.entrySet())
{
message = listener.modifyMessage(event, onlinePlayer, message);
try
{
message = listener.getValue().modifyMessage(event, onlinePlayer, message);
}
catch (Throwable t)
{
if (ess.getSettings().isDebug())
{
logger.log(Level.WARNING, "Error with EssentialsChat listener of " + listener.getKey() + ": " + t.getMessage(), t);
}
else
{
logger.log(Level.WARNING, "Error with EssentialsChat listener of " + listener.getKey() + ": " + t.getMessage());
}
}
}
}
onlineUser.sendMessage(message);