mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-11-05 19:41:56 +00:00
b83a8eccee
Vanilla bukkit/MC persists yaw on teleport
80 lines
No EOL
3.1 KiB
Java
80 lines
No EOL
3.1 KiB
Java
package com.earth2me.essentials.commands;
|
|
|
|
import static com.earth2me.essentials.I18n._;
|
|
import com.earth2me.essentials.Trade;
|
|
import com.earth2me.essentials.User;
|
|
import org.bukkit.Location;
|
|
import org.bukkit.Server;
|
|
import org.bukkit.command.CommandSender;
|
|
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
|
|
|
|
|
|
public class Commandtppos extends EssentialsCommand
|
|
{
|
|
public Commandtppos()
|
|
{
|
|
super("tppos");
|
|
}
|
|
|
|
@Override
|
|
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
|
|
{
|
|
if (args.length < 3)
|
|
{
|
|
throw new NotEnoughArgumentsException();
|
|
}
|
|
|
|
final double x = args[0].startsWith("~") ? user.getLocation().getX() + Integer.parseInt(args[0].substring(1)) : Integer.parseInt(args[0]);
|
|
final double y = args[1].startsWith("~") ? user.getLocation().getY() + Integer.parseInt(args[1].substring(1)) : Integer.parseInt(args[1]);
|
|
final double z = args[2].startsWith("~") ? user.getLocation().getZ() + Integer.parseInt(args[2].substring(1)) : Integer.parseInt(args[2]);
|
|
final Location location = new Location(user.getWorld(), x, y, z, user.getLocation().getYaw(), user.getLocation().getPitch());
|
|
if (args.length > 3)
|
|
{
|
|
location.setYaw((Float.parseFloat(args[3]) + 180 + 360) % 360);
|
|
}
|
|
if (args.length > 4)
|
|
{
|
|
location.setPitch(Float.parseFloat(args[4]));
|
|
}
|
|
if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000)
|
|
{
|
|
throw new NotEnoughArgumentsException("Value of coordinates cannot be over 30000000"); //TODO: I18n
|
|
}
|
|
final Trade charge = new Trade(this.getName(), ess);
|
|
charge.isAffordableFor(user);
|
|
user.sendMessage(_("teleporting"));
|
|
user.getTeleport().teleport(location, charge, TeleportCause.COMMAND);
|
|
throw new NoChargeException();
|
|
}
|
|
|
|
@Override
|
|
public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
|
|
{
|
|
if (args.length < 4)
|
|
{
|
|
throw new NotEnoughArgumentsException();
|
|
}
|
|
|
|
User user = ess.getUser(server.getPlayer(args[0]));
|
|
final double x = args[1].startsWith("~") ? user.getLocation().getX() + Integer.parseInt(args[1].substring(1)) : Integer.parseInt(args[1]);
|
|
final double y = args[2].startsWith("~") ? user.getLocation().getY() + Integer.parseInt(args[2].substring(1)) : Integer.parseInt(args[2]);
|
|
final double z = args[3].startsWith("~") ? user.getLocation().getZ() + Integer.parseInt(args[3].substring(1)) : Integer.parseInt(args[3]);
|
|
final Location location = new Location(user.getWorld(), x, y, z, user.getLocation().getYaw(), user.getLocation().getPitch());
|
|
if (args.length > 4)
|
|
{
|
|
location.setYaw((Float.parseFloat(args[4]) + 180 + 360) % 360);
|
|
}
|
|
if (args.length > 5)
|
|
{
|
|
location.setPitch(Float.parseFloat(args[5]));
|
|
}
|
|
if (x > 30000000 || y > 30000000 || z > 30000000 || x < -30000000 || y < -30000000 || z < -30000000)
|
|
{
|
|
throw new NotEnoughArgumentsException("Value of coordinates cannot be over 30000000"); //TODO: I18n
|
|
}
|
|
sender.sendMessage(_("teleporting"));
|
|
user.sendMessage(_("teleporting"));
|
|
user.getTeleport().teleport(location, null, TeleportCause.COMMAND);
|
|
|
|
}
|
|
} |