From 92fa415848453fc3e0ca0471729363b358930e18 Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Tue, 31 Jan 2012 08:33:14 +0000
Subject: [PATCH] More info, and less severe warning on jail error.

---
 .../src/com/earth2me/essentials/Jails.java    | 27 ++++++++++++++++---
 Essentials/src/messages.properties            |  2 +-
 Essentials/src/messages_da.properties         |  2 +-
 Essentials/src/messages_de.properties         |  2 +-
 Essentials/src/messages_en.properties         |  2 +-
 Essentials/src/messages_es.properties         |  2 +-
 Essentials/src/messages_fr.properties         |  2 +-
 Essentials/src/messages_nl.properties         |  2 +-
 8 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/Jails.java b/Essentials/src/com/earth2me/essentials/Jails.java
index 7035fb859..0011905ec 100644
--- a/Essentials/src/com/earth2me/essentials/Jails.java
+++ b/Essentials/src/com/earth2me/essentials/Jails.java
@@ -208,7 +208,14 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			}
 			catch (Exception ex)
 			{
-				LOGGER.log(Level.WARNING, _("returnPlayerToJailError"), ex);
+				if (ess.getSettings().isDebug())
+				{
+					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
+				}
+				else
+				{
+					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
+				}
 			}
 		}
 
@@ -227,7 +234,14 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			}
 			catch (Exception ex)
 			{
-				LOGGER.log(Level.WARNING, _("returnPlayerToJailError"), ex);
+				if (ess.getSettings().isDebug())
+				{
+					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
+				}
+				else
+				{
+					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
+				}
 			}
 			user.sendMessage(_("jailMessage"));
 		}
@@ -247,7 +261,14 @@ public class Jails extends AsyncStorageObjectHolder<com.earth2me.essentials.sett
 			}
 			catch (Exception ex)
 			{
-				LOGGER.log(Level.WARNING, _("returnPlayerToJailError"), ex);
+				if (ess.getSettings().isDebug())
+				{
+					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()), ex);
+				}
+				else
+				{
+					LOGGER.log(Level.INFO, _("returnPlayerToJailError", user.getName(), ex.getLocalizedMessage()));
+				}
 			}
 			user.sendMessage(_("jailMessage"));
 		}
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index abc643ae4..ec55210b0 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -295,7 +295,7 @@ requestDeniedFrom=\u00a77{0} denied your teleport request.
 requestSent=\u00a77Request sent to {0}\u00a77.
 requestTimedOut=\u00a7cTeleport request has timed out
 requiredBukkit= * ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
-returnPlayerToJailError=Error occurred when trying to return player to jail.
+returnPlayerToJailError=Error occurred when trying to return player {0} to jail: {1}
 second=second
 seconds=seconds
 seenOffline=Player {0} is offline since {1}
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index b3821ea27..03bbe6f78 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -295,7 +295,7 @@ requestDeniedFrom=\u00a77{0} afviste din anmodning om teleport.
 requestSent=\u00a77Anmodning sendt til {0}\u00a77.
 requestTimedOut=\u00a7cTeleport request has timed out
 requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
-returnPlayerToJailError=En fejl opstod ved fors\u00f8g p\u00e5 at returnere spilleren til f\u00e6ngsel.
+returnPlayerToJailError=Error occurred when trying to return player {0} to jail: {1}
 second=sekund
 seconds=sekunder
 seenOffline=Spilleren {0} har v\u00c3\u00a6ret offline i {1}
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 1b84e78a8..edffe33ac 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -295,7 +295,7 @@ requestDeniedFrom=\u00a77{0} hat deine Teleportierungsanfrage abgelehnt.
 requestSent=\u00a77Anfrage gesendet an {0}\u00a77.
 requestTimedOut=\u00a7cTeleport request has timed out
 requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
-returnPlayerToJailError=Fehler beim Versuch, den Spieler ins Gef\u00e4ngnis zu teleportieren.
+returnPlayerToJailError=Error occurred when trying to return player {0} to jail: {1}
 second=Sekunde
 seconds=Sekunden
 seenOffline=Spieler {0} ist offline seit {1}
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 86dbc9a37..b03a49812 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -295,7 +295,7 @@ requestDeniedFrom=\u00a77{0} denied your teleport request
 requestSent=\u00a77Request sent to {0}\u00a77.
 requestTimedOut=\u00a7cTeleport request has timed out
 requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
-returnPlayerToJailError=Error occurred when trying to return player to jail.
+returnPlayerToJailError=Error occurred when trying to return player {0} to jail: {1}
 second=second
 seconds=seconds
 seenOffline=Player {0} is offline since {1}
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index 7227f375c..4f3da7738 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -295,7 +295,7 @@ requestDeniedFrom=\u00a77{0} ha denegado tu peticion de teletransporte.
 requestSent=\u00a77Peticion enviada a {0}\u00a77.
 requestTimedOut=\u00a7cTeleport request has timed out
 requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
-returnPlayerToJailError=Error al intentar quitar al jugador de la carcel.
+returnPlayerToJailError=Error occurred when trying to return player {0} to jail: {1}
 second=segundo
 seconds=segundos
 seenOffline=El jugador {0} esta desconectado desde {1}
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 9258963bd..1649a552a 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -295,7 +295,7 @@ requestDeniedFrom=\u00a77{0} a refus\u00e9 votre demande de t\u00e9l\u00e9portat
 requestSent=\u00a77Requ\u00eate envoy\u00e9e \u00e0 {0}\u00a77.
 requestTimedOut=\u00a7cLa de mande de t\u00e9l\u00e9portation a expir\u00e9.
 requiredBukkit=* ! * Vous avez besoin au moins de la version {0} de CraftBukkit. T\u00e9l\u00e9chargez-la ici http://ci.bukkit.org.
-returnPlayerToJailError=Erreur survenue lors de la tentative d'emprisonner de nouveau un joueur.
+returnPlayerToJailError=Error occurred when trying to return player {0} to jail: {1}
 second=seconde
 seconds=secondes
 seenOffline=Le joueur {0} est hors ligne depuis {1}
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 30c9caaee..16d942b0d 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -295,7 +295,7 @@ requestDeniedFrom=\u00a77{0} denied your teleport request.
 requestSent=\u00a77Aanvraag verstuurd naar {0}\u00a77.
 requestTimedOut=\u00a7cTeleport request has timed out
 requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
-returnPlayerToJailError=Fout opgetreden bij terugzetten van speler in gevangenis.
+returnPlayerToJailError=Error occurred when trying to return player {0} to jail: {1}
 second=seconde
 seconds=seconde
 seenOffline=Speler {0} is offline vanaf {1}