2011-03-30 04:03:21 +00:00
|
|
|
package com.earth2me.essentials.commands;
|
|
|
|
|
2015-07-03 17:07:25 +00:00
|
|
|
import com.earth2me.essentials.Teleport;
|
2011-06-13 13:05:11 +00:00
|
|
|
import com.earth2me.essentials.Trade;
|
2011-03-30 04:03:21 +00:00
|
|
|
import com.earth2me.essentials.User;
|
2014-01-12 01:23:12 +00:00
|
|
|
import org.bukkit.Location;
|
2011-11-18 17:42:26 +00:00
|
|
|
import org.bukkit.Server;
|
2011-12-07 01:12:36 +00:00
|
|
|
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
|
2011-03-30 04:03:21 +00:00
|
|
|
|
2015-04-15 04:06:16 +00:00
|
|
|
import static com.earth2me.essentials.I18n.tl;
|
|
|
|
|
2011-03-30 04:03:21 +00:00
|
|
|
|
2015-04-15 04:06:16 +00:00
|
|
|
public class Commandtpaccept extends EssentialsCommand {
|
|
|
|
public Commandtpaccept() {
|
|
|
|
super("tpaccept");
|
|
|
|
}
|
2011-03-30 04:03:21 +00:00
|
|
|
|
2015-04-15 04:06:16 +00:00
|
|
|
@Override
|
|
|
|
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
|
|
|
|
final User requester;
|
|
|
|
try {
|
|
|
|
requester = ess.getUser(user.getTeleportRequest());
|
|
|
|
} catch (Exception ex) {
|
|
|
|
throw new Exception(tl("noPendingRequest"));
|
|
|
|
}
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
|
2015-04-15 04:06:16 +00:00
|
|
|
if (!requester.getBase().isOnline()) {
|
|
|
|
throw new Exception(tl("noPendingRequest"));
|
|
|
|
}
|
2012-03-20 14:32:11 +00:00
|
|
|
|
2015-04-15 04:06:16 +00:00
|
|
|
if (user.isTpRequestHere() && ((!requester.isAuthorized("essentials.tpahere") && !requester.isAuthorized("essentials.tpaall")) || (user.getWorld() != requester.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + user.getWorld().getName())))) {
|
|
|
|
throw new Exception(tl("noPendingRequest"));
|
|
|
|
}
|
2012-03-20 14:32:11 +00:00
|
|
|
|
2015-04-15 04:06:16 +00:00
|
|
|
if (!user.isTpRequestHere() && (!requester.isAuthorized("essentials.tpa") || (user.getWorld() != requester.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + requester.getWorld().getName())))) {
|
|
|
|
throw new Exception(tl("noPendingRequest"));
|
|
|
|
}
|
2012-03-20 14:32:11 +00:00
|
|
|
|
2015-04-15 04:06:16 +00:00
|
|
|
if (args.length > 0 && !requester.getName().contains(args[0])) {
|
|
|
|
throw new Exception(tl("noPendingRequest"));
|
|
|
|
}
|
This is a big refactoring of the user class and more.
Many commands have been cleaned.
File changes:
- all user data has been moved from users.yml to userdata folder
- all files in userdata folder are lower case
Both changes should be done automatically.
Class changes:
- Moved all user data functions to UserData class
- Moved all user teleport functions to Teleport class
- Moved the user list to Essentials class
- Less static functions for better testing
- EssentialsCommand now has ess Property (Essentials class)
- New NotEnoughArgumentsException, that will show command description and syntax
New commands:
- /seen, shows the last login or logout
- /tempban, temporarily ban someone
- /tjail and mute, temporarily option added
Other changes:
- ban reason is saved
- don't show "You have xxx mail" on login, if user doesn't have essentials.mail permission
- time will be parsed: years, months (mo), weeks, days, hours, minutes (m), seconds, these can be shortened and combined, example: 2 days 5h 30m
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1300 e251c2fe-e539-e718-e476-b85c1f46cddb
2011-05-01 21:07:30 +00:00
|
|
|
|
2016-11-23 13:41:11 +00:00
|
|
|
if (!user.hasOutstandingTeleportRequest()) {
|
2015-04-15 04:06:16 +00:00
|
|
|
user.requestTeleport(null, false);
|
|
|
|
throw new Exception(tl("requestTimedOut"));
|
|
|
|
}
|
2011-12-08 23:43:09 +00:00
|
|
|
|
2015-04-15 04:06:16 +00:00
|
|
|
final Trade charge = new Trade(this.getName(), ess);
|
|
|
|
user.sendMessage(tl("requestAccepted"));
|
|
|
|
requester.sendMessage(tl("requestAcceptedFrom", user.getDisplayName()));
|
2011-11-15 21:47:02 +00:00
|
|
|
|
2015-04-15 04:06:16 +00:00
|
|
|
try {
|
|
|
|
if (user.isTpRequestHere()) {
|
|
|
|
final Location loc = user.getTpRequestLocation();
|
2015-07-03 17:07:25 +00:00
|
|
|
Teleport teleport = requester.getTeleport();
|
|
|
|
teleport.setTpType(Teleport.TeleportType.TPA);
|
|
|
|
teleport.teleportPlayer(user, user.getTpRequestLocation(), charge, TeleportCause.COMMAND);
|
2015-04-15 04:06:16 +00:00
|
|
|
requester.sendMessage(tl("teleporting", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
|
|
|
|
} else {
|
2015-07-03 17:07:25 +00:00
|
|
|
Teleport teleport = requester.getTeleport();
|
|
|
|
teleport.setTpType(Teleport.TeleportType.TPA);
|
|
|
|
teleport.teleport(user.getBase(), charge, TeleportCause.COMMAND);
|
2015-04-15 04:06:16 +00:00
|
|
|
}
|
|
|
|
} catch (Exception ex) {
|
|
|
|
user.sendMessage(tl("pendingTeleportCancelled"));
|
|
|
|
ess.showError(requester.getSource(), ex, commandLabel);
|
|
|
|
}
|
|
|
|
user.requestTeleport(null, false);
|
|
|
|
throw new NoChargeException();
|
|
|
|
}
|
2014-02-01 21:49:54 +00:00
|
|
|
|
2011-03-30 04:03:21 +00:00
|
|
|
}
|