Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-26 02:58:03 +01:00
Code Issues Projects Releases Wiki Activity

Warn other party when teleport fails after tpaccept.

Browse Source
This commit is contained in:
KHobbits 2012-12-20 20:01:43 +00:00
parent 371a6437ae
commit 10b972bd07
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
View File

@ -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();