TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-08-13 06:27:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix order of messages

Browse source
This commit is contained in:
Alexander Schepp 2012-12-16 13:48:02 +01:00
parent 5a855eede5
commit 020f2c3ea5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Essentials/src/com/earth2me/essentials/commands/Commandtp.java
View file

@ -46,7 +46,6 @@ public class Commandtp extends EssentialsCommand
{ {
throw new Exception(_("noPerm", "essentials.tp.others")); throw new Exception(_("noPerm", "essentials.tp.others"));
} }
user.sendMessage(_("teleporting"));
final User target2 = getPlayer(server, args, 0); 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 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]); 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())); throw new Exception(_("teleportDisabled", target2.getDisplayName()));
} }
target2.getTeleport().now(location, false, TeleportCause.COMMAND); target2.getTeleport().now(location, false, TeleportCause.COMMAND);
user.sendMessage(_("teleporting"));
target2.sendMessage(_("teleporting")); target2.sendMessage(_("teleporting"));
case 2: case 2:
default: default:
@ -68,7 +68,6 @@ public class Commandtp extends EssentialsCommand
{ {
throw new Exception(_("noPerm", "essentials.tp.others")); throw new Exception(_("noPerm", "essentials.tp.others"));
} }
user.sendMessage(_("teleporting"));
final User target = getPlayer(server, args, 0); final User target = getPlayer(server, args, 0);
final User toPlayer = getPlayer(server, args, 1); final User toPlayer = getPlayer(server, args, 1);
if (!target.isTeleportEnabled()) if (!target.isTeleportEnabled())
@ -85,6 +84,7 @@ public class Commandtp extends EssentialsCommand
throw new Exception(_("noPerm", "essentials.worlds." + toPlayer.getWorld().getName())); throw new Exception(_("noPerm", "essentials.worlds." + toPlayer.getWorld().getName()));
} }
target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND); target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND);
user.sendMessage(_("teleporting"));
target.sendMessage(_("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName())); target.sendMessage(_("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName()));
break; break;
} }