mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-07-25 06:53:37 +00:00
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
This commit is contained in:
parent
03fd6249fc
commit
224c18348a
126 changed files with 3542 additions and 3145 deletions
|
@ -1,7 +1,6 @@
|
|||
package com.earth2me.essentials.commands;
|
||||
|
||||
import org.bukkit.Server;
|
||||
import com.earth2me.essentials.Essentials;
|
||||
import com.earth2me.essentials.User;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
|
@ -14,48 +13,51 @@ public class Commandtp extends EssentialsCommand
|
|||
}
|
||||
|
||||
@Override
|
||||
public void run(Server server, Essentials parent, User user, String commandLabel, String[] args) throws Exception
|
||||
public void run(Server server, User user, String commandLabel, String[] args) throws Exception
|
||||
{
|
||||
switch (args.length)
|
||||
{
|
||||
case 0:
|
||||
user.sendMessage("§cUsage: /" + commandLabel + " <target> [to-player]");
|
||||
return;
|
||||
throw new NotEnoughArgumentsException();
|
||||
|
||||
case 1:
|
||||
User p = getPlayer(server, args, 0);
|
||||
user.teleportCooldown();
|
||||
if (!p.isTeleEnabled()) throw new Exception(p.getDisplayName() + " has teleportation disabled.");
|
||||
if (!p.isTeleportEnabled())
|
||||
{
|
||||
throw new Exception(p.getDisplayName() + " has teleportation disabled.");
|
||||
}
|
||||
user.sendMessage("§7Teleporting...");
|
||||
user.canAfford(this);
|
||||
user.teleportTo(p, this.getName());
|
||||
user.getTeleport().teleport(p, this.getName());
|
||||
break;
|
||||
|
||||
case 2:
|
||||
if (!user.isAuthorized("essentials.tpohere")) throw new Exception("You need access to /tpohere to teleport other players.");
|
||||
if (!user.isAuthorized("essentials.tpohere"))
|
||||
{
|
||||
throw new Exception("You need access to /tpohere to teleport other players.");
|
||||
}
|
||||
user.sendMessage("§7Teleporting...");
|
||||
user.charge(this);
|
||||
charge(user);
|
||||
User target = getPlayer(server, args, 0);
|
||||
User toPlayer = getPlayer(server, args, 1);
|
||||
target.teleportToNow(toPlayer);
|
||||
target.getTeleport().now(toPlayer);
|
||||
target.sendMessage("§7" + user.getDisplayName() + "§7 teleported you to " + toPlayer.getDisplayName() + "§7.");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run(Server server, Essentials parent, CommandSender sender, String commandLabel, String[] args) throws Exception
|
||||
public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
|
||||
{
|
||||
if (args.length < 2)
|
||||
{
|
||||
sender.sendMessage("Usage: /" + commandLabel + " [target] [to-player]");
|
||||
return;
|
||||
throw new NotEnoughArgumentsException();
|
||||
}
|
||||
|
||||
sender.sendMessage("§7Teleporting...");
|
||||
User target = getPlayer(server, args, 0);
|
||||
User toPlayer = getPlayer(server, args, 1);
|
||||
target.teleportToNow(toPlayer);
|
||||
target.getTeleport().now(toPlayer);
|
||||
target.sendMessage("§7{Console}§7 teleported you to " + toPlayer.getDisplayName() + "§7.");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue