diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-12-20 20:01:43 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-12-20 20:24:07 +0000 |
| commit | f83935545941065bc31c86a426c39f40dc69352d (patch) | |
| tree | f8b58f9d09cef12caa12b94bdf6557b02a03d026 | |
| parent | 22e8f9e194888d696b7da5d5b9340e2f3b34d29e (diff) | |
| download | Essentials-f83935545941065bc31c86a426c39f40dc69352d.tar Essentials-f83935545941065bc31c86a426c39f40dc69352d.tar.gz Essentials-f83935545941065bc31c86a426c39f40dc69352d.tar.lz Essentials-f83935545941065bc31c86a426c39f40dc69352d.tar.xz Essentials-f83935545941065bc31c86a426c39f40dc69352d.zip | |
Warn other party when teleport fails after tpaccept.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java index f15935053..7c950ae96 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java @@ -1,5 +1,6 @@ package com.earth2me.essentials.commands; +import com.earth2me.essentials.ChargeException; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; @@ -55,13 +56,21 @@ public class Commandtpaccept extends EssentialsCommand user.sendMessage(_("requestAccepted")); target.sendMessage(_("requestAcceptedFrom", user.getDisplayName())); - if (user.isTpRequestHere()) + try { - target.getTeleport().teleportToMe(user, charge, TeleportCause.COMMAND); + if (user.isTpRequestHere()) + { + target.getTeleport().teleportToMe(user, charge, TeleportCause.COMMAND); + } + else + { + target.getTeleport().teleport(user, charge, TeleportCause.COMMAND); + } } - else + catch (ChargeException ex) { - target.getTeleport().teleport(user, charge, TeleportCause.COMMAND); + user.sendMessage(_("pendingTeleportCancelled")); + ess.showError(target, ex, commandLabel); } user.requestTeleport(null, false); throw new NoChargeException(); |