summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgmfreaky <gmfreaky@gmail.com>2013-03-15 17:31:54 +0100
committergmfreaky <gmfreaky@gmail.com>2013-03-15 17:31:54 +0100
commit7901f6e9b9cf630cb54f1b58baf596a106af4ec8 (patch)
tree2a4316ad19db37279e64aff98b77b4c4464f3ad8
parente5b26fc061c8723dd47e5415c919d78bcd9988d2 (diff)
downloadEssentials-7901f6e9b9cf630cb54f1b58baf596a106af4ec8.tar
Essentials-7901f6e9b9cf630cb54f1b58baf596a106af4ec8.tar.gz
Essentials-7901f6e9b9cf630cb54f1b58baf596a106af4ec8.tar.lz
Essentials-7901f6e9b9cf630cb54f1b58baf596a106af4ec8.tar.xz
Essentials-7901f6e9b9cf630cb54f1b58baf596a106af4ec8.zip
Keep player orientation when teleporting
When no pitch/yaw was specified, take the current pitch/yaw of the player.
-rw-r--r--Essentials/src/net/ess3/commands/Commandtppos.java8
1 files 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
+}