From 139f99d98fd7805fc6e8523f06476848118d4831 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sun, 24 Nov 2013 23:48:04 +0000 Subject: Try to be a little less confusing with non-command debug errors. --- .../src/com/earth2me/essentials/TimedTeleport.java | 2 +- .../earth2me/essentials/signs/EssentialsSign.java | 27 +++++++++++++--------- .../essentials/chat/EssentialsChatPlayer.java | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/TimedTeleport.java b/Essentials/src/com/earth2me/essentials/TimedTeleport.java index 549b9f9bf..cf1a2497b 100644 --- a/Essentials/src/com/earth2me/essentials/TimedTeleport.java +++ b/Essentials/src/com/earth2me/essentials/TimedTeleport.java @@ -114,7 +114,7 @@ public class TimedTeleport implements Runnable } catch (Exception ex) { - ess.showError(teleportOwner.getSource(), ex, "teleport"); + ess.showError(teleportOwner.getSource(), ex, "\\ teleport"); } } catch (Exception ex) diff --git a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java index 482b66fcb..3c419fd2d 100644 --- a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java +++ b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java @@ -51,11 +51,11 @@ public class EssentialsSign } catch (ChargeException ex) { - ess.showError(user.getSource(), ex, signName); + showError(ess, user.getSource(), ex, signName); } catch (SignException ex) { - ess.showError(user.getSource(), ex, signName); + showError(ess, user.getSource(), ex, signName); } // Return true, so the player sees the wrong sign. return true; @@ -97,12 +97,12 @@ public class EssentialsSign } catch (ChargeException ex) { - ess.showError(user.getSource(), ex, signName); + showError(ess, user.getSource(), ex, signName); return false; } catch (SignException ex) { - ess.showError(user.getSource(), ex, signName); + showError(ess, user.getSource(), ex, signName); return false; } } @@ -119,7 +119,7 @@ public class EssentialsSign } catch (SignException ex) { - ess.showError(user.getSource(), ex, signName); + showError(ess, user.getSource(), ex, signName); return false; } } @@ -148,11 +148,11 @@ public class EssentialsSign } catch (ChargeException ex) { - ess.showError(user.getSource(), ex, signName); + showError(ess, user.getSource(), ex, signName); } catch (SignException ex) { - ess.showError(user.getSource(), ex, signName); + showError(ess, user.getSource(), ex, signName); } return false; } @@ -166,11 +166,11 @@ public class EssentialsSign } catch (ChargeException ex) { - ess.showError(user.getSource(), ex, signName); + showError(ess, user.getSource(), ex, signName); } catch (SignException ex) { - ess.showError(user.getSource(), ex, signName); + showError(ess, user.getSource(), ex, signName); } return false; } @@ -184,7 +184,7 @@ public class EssentialsSign } catch (SignException ex) { - ess.showError(user.getSource(), ex, signName); + showError(ess, user.getSource(), ex, signName); } return false; } @@ -457,7 +457,12 @@ public class EssentialsSign return new Trade(money, ess); } } - + + + private void showError(final IEssentials ess, final CommandSource sender, final Throwable exception, final String signName) + { + ess.showError(sender, exception, "\\ sign: " + signName); + } static class EventSign implements ISign { diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java index 9554c63f6..0a1be2222 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java @@ -82,7 +82,7 @@ public abstract class EssentialsChatPlayer implements Listener } catch (ChargeException e) { - ess.showError(chatStore.getUser().getSource(), e, chatStore.getLongType()); + ess.showError(chatStore.getUser().getSource(), e, "\\ chat " + chatStore.getLongType()); event.setCancelled(true); return false; } -- cgit v1.2.3