minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-28 08:50:02 +02:00
Code Issues Releases Wiki Activity

Warn other party when teleport fails after tpaccept

Browse Source 
10b972bd07
This commit is contained in:
Chris Ward
2013-01-09 18:47:35 +11:00
parent 530dfd9129
commit d19ffc6cc0
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Essentials/src/net/ess3/commands/Commandtpaccept.java
View File

@@ -1,6 +1,9 @@
package net.ess3.commands; package net.ess3.commands;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.ChargeException;
import net.ess3.utils.Util;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import net.ess3.api.ISettings; import net.ess3.api.ISettings;
import net.ess3.api.IUser; import net.ess3.api.IUser;
@@ -44,13 +47,21 @@ public class Commandtpaccept extends EssentialsCommand
user.sendMessage(_("requestAccepted")); user.sendMessage(_("requestAccepted"));
target.sendMessage(_("requestAcceptedFrom", user.getPlayer().getDisplayName())); target.sendMessage(_("requestAcceptedFrom", user.getPlayer().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.getPlayer(), charge, TeleportCause.COMMAND);
}
} }
else catch (ChargeException ex)
{ {
target.getTeleport().teleport(user.getPlayer(), charge, TeleportCause.COMMAND); user.sendMessage(_("pendingTeleportCancelled"));
//ess.showError(target, ex, commandLabel); TODO: equivalent to ess.showError() could not be found?
} }
user.requestTeleport(null, false); user.requestTeleport(null, false);
throw new NoChargeException(); throw new NoChargeException();