From 7901f6e9b9cf630cb54f1b58baf596a106af4ec8 Mon Sep 17 00:00:00 2001 From: gmfreaky Date: Fri, 15 Mar 2013 17:31:54 +0100 Subject: Keep player orientation when teleporting When no pitch/yaw was specified, take the current pitch/yaw of the player. --- Essentials/src/net/ess3/commands/Commandtppos.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Essentials/src/net/ess3/commands/Commandtppos.java b/Essentials/src/net/ess3/commands/Commandtppos.java index 13b4d7052..042b6ce05 100644 --- a/Essentials/src/net/ess3/commands/Commandtppos.java +++ b/Essentials/src/net/ess3/commands/Commandtppos.java @@ -21,7 +21,8 @@ public class Commandtppos extends EssentialsCommand final int x = Integer.parseInt(args[0]); final int y = Integer.parseInt(args[1]); final int z = Integer.parseInt(args[2]); - final Location location = new Location(user.getPlayer().getWorld(), x, y, z); + final Location playerLocation = user.getPlayer().getLocation(); + final Location location = new Location(user.getPlayer().getWorld(), x, y, z, playerLocation.getYaw(), playerLocation.getPitch()); if (args.length > 3) { location.setYaw((Float.parseFloat(args[3]) + 180 + 360) % 360); @@ -53,7 +54,8 @@ public class Commandtppos extends EssentialsCommand final int x = Integer.parseInt(args[1]); final int y = Integer.parseInt(args[2]); final int z = Integer.parseInt(args[3]); - final Location location = new Location(user.getPlayer().getWorld(), x, y, z); + final Location playerLocation = user.getPlayer().getLocation(); + final Location location = new Location(user.getPlayer().getWorld(), x, y, z, playerLocation.getYaw(), playerLocation.getPitch()); if (args.length > 4) { location.setYaw((Float.parseFloat(args[4]) + 180 + 360) % 360); @@ -70,4 +72,4 @@ public class Commandtppos extends EssentialsCommand user.sendMessage(_("teleporting")); user.getTeleport().teleport(location, null, TeleportCause.COMMAND); } -} \ No newline at end of file +} -- cgit v1.2.3