diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-05-26 16:49:11 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-05-26 16:49:11 +0100 |
| commit | 19451c151ed02c57f3208901e6a33f6a3392f409 (patch) | |
| tree | 54661ea99c5fe52ec7e19eaa148fd50057d4c810 | |
| parent | e4d041b9b03e36984ed108913bb2749ea7f5c4fd (diff) | |
| download | Essentials-19451c151ed02c57f3208901e6a33f6a3392f409.tar Essentials-19451c151ed02c57f3208901e6a33f6a3392f409.tar.gz Essentials-19451c151ed02c57f3208901e6a33f6a3392f409.tar.lz Essentials-19451c151ed02c57f3208901e6a33f6a3392f409.tar.xz Essentials-19451c151ed02c57f3208901e6a33f6a3392f409.zip | |
Show teleport cancel messages to tpa user.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java | 2 | ||||
| -rw-r--r-- | Essentials/src/messages.properties | 4 | ||||
| -rw-r--r-- | Essentials/src/messages_en.properties | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java index 647b223f7..a0dae971b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java @@ -67,7 +67,7 @@ public class Commandtpaccept extends EssentialsCommand target.getTeleport().teleport(user, charge, TeleportCause.COMMAND); } } - catch (ChargeException ex) + catch (Exception ex) { user.sendMessage(_("pendingTeleportCancelled")); ess.showError(target, ex, commandLabel); diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 3efc691ec..ab42d0d10 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -134,8 +134,8 @@ geoIpUrlEmpty=GeoIP download url is empty. geoIpUrlInvalid=GeoIP download url is invalid. geoipJoinFormat=\u00a76Player \u00a7c{0} \u00a76comes from \u00a7c{1}\u00a76. giveSpawn=\u00a76Giving\u00a7c {0} \u00a76of\u00a7c {1} to\u00a7c {2}\u00a76. -godDisabledFor=\u00a74disabled\u00a76 for\u00a7c {0}. -godEnabledFor=\u00a7aenabled\u00a76 for\u00a7c {0}. +godDisabledFor=\u00a74disabled\u00a76 for\u00a7c {0} +godEnabledFor=\u00a7aenabled\u00a76 for\u00a7c {0} godMode=\u00a76God mode\u00a7c {0}\u00a76. groupDoesNotExist=\u00a74There's no one online in this group! groupNumber=\u00a7c{0}\u00a7f online, for the full list:\u00a7c /{1} {2} diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 3efc691ec..ab42d0d10 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -134,8 +134,8 @@ geoIpUrlEmpty=GeoIP download url is empty. geoIpUrlInvalid=GeoIP download url is invalid. geoipJoinFormat=\u00a76Player \u00a7c{0} \u00a76comes from \u00a7c{1}\u00a76. giveSpawn=\u00a76Giving\u00a7c {0} \u00a76of\u00a7c {1} to\u00a7c {2}\u00a76. -godDisabledFor=\u00a74disabled\u00a76 for\u00a7c {0}. -godEnabledFor=\u00a7aenabled\u00a76 for\u00a7c {0}. +godDisabledFor=\u00a74disabled\u00a76 for\u00a7c {0} +godEnabledFor=\u00a7aenabled\u00a76 for\u00a7c {0} godMode=\u00a76God mode\u00a7c {0}\u00a76. groupDoesNotExist=\u00a74There's no one online in this group! groupNumber=\u00a7c{0}\u00a7f online, for the full list:\u00a7c /{1} {2} |