mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-07-03 12:31:46 +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
|
@ -3,7 +3,6 @@ package com.earth2me.essentials.commands;
|
|||
import org.bukkit.Server;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
import com.earth2me.essentials.Essentials;
|
||||
import com.earth2me.essentials.User;
|
||||
|
||||
|
||||
|
@ -15,35 +14,31 @@ public class Commandban extends EssentialsCommand
|
|||
}
|
||||
|
||||
@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 < 1)
|
||||
{
|
||||
sender.sendMessage("§cUsage: /" + commandLabel + " [player] <reason>");
|
||||
return;
|
||||
throw new NotEnoughArgumentsException();
|
||||
}
|
||||
|
||||
try
|
||||
User p = null;
|
||||
if (server.matchPlayer(args[0]).isEmpty())
|
||||
{
|
||||
User p = null;
|
||||
if (server.matchPlayer(args[0]).isEmpty())
|
||||
{
|
||||
((CraftServer)server).getHandle().a(args[0]);
|
||||
sender.sendMessage("§cPlayer " + args[0] + " banned");
|
||||
}
|
||||
else
|
||||
{
|
||||
p = User.get(server.matchPlayer(args[0]).get(0));
|
||||
p.kickPlayer(args.length > 1 ? getFinalArg(args, 1) : "Banned from server");
|
||||
((CraftServer)server).getHandle().a(p.getName());
|
||||
sender.sendMessage("§cPlayer " + p.getName() + " banned");
|
||||
}
|
||||
Essentials.getStatic().loadBanList();
|
||||
((CraftServer)server).getHandle().a(args[0]);
|
||||
sender.sendMessage("§cPlayer " + args[0] + " banned");
|
||||
}
|
||||
catch (Throwable ex)
|
||||
else
|
||||
{
|
||||
ex.printStackTrace();
|
||||
sender.sendMessage("Error: " + ex);
|
||||
p = ess.getUser(server.matchPlayer(args[0]).get(0));
|
||||
String banReason = "Banned from server";
|
||||
if(args.length > 1) {
|
||||
banReason = getFinalArg(args, 1);
|
||||
p.setBanReason(commandLabel);
|
||||
}
|
||||
p.kickPlayer(banReason);
|
||||
((CraftServer)server).getHandle().a(p.getName());
|
||||
sender.sendMessage("§cPlayer " + p.getName() + " banned");
|
||||
}
|
||||
ess.loadBanList();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue