summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Schepp <schneeleo@gmail.com>2012-12-16 13:48:02 +0100
committerAlexander Schepp <schneeleo@gmail.com>2012-12-16 13:48:02 +0100
commit020f2c3ea5b496bd87470cd2dd929c8cd2876ab5 (patch)
tree613b022ba406a395d0b9f6958e80067a5f328a34
parent5a855eede5d6e0d46ce67b0d3cf592b63622efa1 (diff)
downloadEssentials-020f2c3ea5b496bd87470cd2dd929c8cd2876ab5.tar
Essentials-020f2c3ea5b496bd87470cd2dd929c8cd2876ab5.tar.gz
Essentials-020f2c3ea5b496bd87470cd2dd929c8cd2876ab5.tar.lz
Essentials-020f2c3ea5b496bd87470cd2dd929c8cd2876ab5.tar.xz
Essentials-020f2c3ea5b496bd87470cd2dd929c8cd2876ab5.zip
Fix order of messages
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtp.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java b/Essentials/src/com/earth2me/essentials/commands/Commandtp.java
index 64332be68..b2da82a2c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtp.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtp.java
@@ -46,7 +46,6 @@ public class Commandtp extends EssentialsCommand
{
throw new Exception(_("noPerm", "essentials.tp.others"));
}
- user.sendMessage(_("teleporting"));
final User target2 = getPlayer(server, args, 0);
final double x = args[1].startsWith("~") ? target2.getLocation().getX() + Integer.parseInt(args[1].substring(1)) : Integer.parseInt(args[1]);
final double y = args[2].startsWith("~") ? target2.getLocation().getY() + Integer.parseInt(args[2].substring(1)) : Integer.parseInt(args[2]);
@@ -61,6 +60,7 @@ public class Commandtp extends EssentialsCommand
throw new Exception(_("teleportDisabled", target2.getDisplayName()));
}
target2.getTeleport().now(location, false, TeleportCause.COMMAND);
+ user.sendMessage(_("teleporting"));
target2.sendMessage(_("teleporting"));
case 2:
default:
@@ -68,7 +68,6 @@ public class Commandtp extends EssentialsCommand
{
throw new Exception(_("noPerm", "essentials.tp.others"));
}
- user.sendMessage(_("teleporting"));
final User target = getPlayer(server, args, 0);
final User toPlayer = getPlayer(server, args, 1);
if (!target.isTeleportEnabled())
@@ -85,6 +84,7 @@ public class Commandtp extends EssentialsCommand
throw new Exception(_("noPerm", "essentials.worlds." + toPlayer.getWorld().getName()));
}
target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND);
+ user.sendMessage(_("teleporting"));
target.sendMessage(_("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName()));
break;
}