summaryrefslogtreecommitdiffstats
path: root/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java
diff options
context:
space:
mode:
authorsnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-05-01 21:07:30 +0000
committersnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-05-01 21:07:30 +0000
commit224c18348ae18ddd6c3e3de0f98a9d3f039e67d8 (patch)
tree73c8b72c8c81258853d73874bd841452d93eb969 /Essentials/src/com/earth2me/essentials/commands/Commandkickall.java
parent03fd6249fc61f15d7e153ae66bccc77b0dc36447 (diff)
downloadEssentials-224c18348ae18ddd6c3e3de0f98a9d3f039e67d8.tar
Essentials-224c18348ae18ddd6c3e3de0f98a9d3f039e67d8.tar.gz
Essentials-224c18348ae18ddd6c3e3de0f98a9d3f039e67d8.tar.lz
Essentials-224c18348ae18ddd6c3e3de0f98a9d3f039e67d8.tar.xz
Essentials-224c18348ae18ddd6c3e3de0f98a9d3f039e67d8.zip
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
Diffstat (limited to 'Essentials/src/com/earth2me/essentials/commands/Commandkickall.java')
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandkickall.java26
1 files changed, 7 insertions, 19 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java b/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java
index d03a805d5..8f0a985e9 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkickall.java
@@ -3,8 +3,7 @@ package com.earth2me.essentials.commands;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-import com.earth2me.essentials.Essentials;
-import com.earth2me.essentials.User;
+
public class Commandkickall extends EssentialsCommand
{
@@ -14,31 +13,20 @@ public class Commandkickall extends EssentialsCommand
}
@Override
- public void run(Server server, Essentials parent, User user, String commandLabel, String[] args) throws Exception
+ public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
{
+ charge(sender);
+
for (Player p : server.getOnlinePlayers())
{
- if (server.getOnlinePlayers().length == 1 && p.getName().equalsIgnoreCase(user.getName()))
+ if (sender instanceof Player && p.getName().equalsIgnoreCase(((Player)sender).getName()))
{
- user.sendMessage("ยง7Only you online...");
- return;
+ continue;
}
else
{
- if (!p.getName().equalsIgnoreCase(user.getName()))
- {
- p.kickPlayer(args.length < 1 ? getFinalArg(args, 0) : "Kicked from server");
- }
+ p.kickPlayer(args.length < 1 ? getFinalArg(args, 0) : "Kicked from server");
}
}
}
-
- @Override
- public void run(Server server, Essentials parent, CommandSender sender, String commandLabel, String[] args) throws Exception
- {
- for (Player p : server.getOnlinePlayers())
- {
- p.kickPlayer(args.length < 1 ? getFinalArg(args, 0) : "Kicked from server");
- }
- }
}