minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-11 00:55:10 +02:00
Code Issues Releases Wiki Activity

This is a big refactoring of the user class and more.

Browse Source 
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:
snowleo
2011-05-01 21:07:30 +00:00
parent 03fd6249fc
commit 224c18348a
126 changed files with 3542 additions and 3145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandsetspawn.java
View File

@@ -14,11 +14,11 @@ public class Commandsetspawn 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
{
user.charge(this);
String group = args.length > 0 ? getFinalArg(args, 0) : "default";
parent.spawn.setSpawn(user.getLocation(), group);
Essentials.getSpawn().setSpawn(user.getLocation(), group);
user.sendMessage("§7Spawn location set for group \"" + group + "\".");
}
}

5
EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
View File

@@ -14,10 +14,9 @@ public class Commandspawn 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
{
user.canAfford(this);
user.teleportCooldown();
user.respawn(Essentials.getStatic().spawn, this.getName());
user.getTeleport().respawn(Essentials.getSpawn(), this.getName());
}
}

23
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
View File

@@ -14,11 +14,11 @@ public class EssentialsSpawnPlayerListener extends PlayerListener
@Override
public void onPlayerRespawn(PlayerRespawnEvent event)
{
User user = User.get(event.getPlayer());
User user = Essentials.getStatic().getUser(event.getPlayer());
try
{
if (Essentials.getSettings().getRespawnAtHome())
if (Essentials.getStatic().getSettings().getRespawnAtHome())
{
event.setRespawnLocation(user.getHome());
return;
@@ -27,23 +27,28 @@ public class EssentialsSpawnPlayerListener extends PlayerListener
catch (Throwable ex)
{
}
event.setRespawnLocation(Essentials.getStatic().spawn.getSpawn(user.getGroup()));
event.setRespawnLocation(Essentials.getSpawn().getSpawn(user.getGroup()));
}
@Override
public void onPlayerJoin(PlayerJoinEvent event)
{
User user = User.get(event.getPlayer());
User user = Essentials.getStatic().getUser(event.getPlayer());
if (!user.isNew()) return;
user.clearNewFlag();
if (!user.isNew())
{
return;
}
user.setNew(false);
try {
user.teleportToNow(Essentials.getStatic().spawn.getSpawn(Essentials.getSettings().getNewbieSpawn()));
user.getTeleport().now(Essentials.getSpawn().getSpawn(Essentials.getStatic().getSettings().getNewbieSpawn()));
} catch (Exception ex) {
Logger.getLogger("Minecraft").log(Level.WARNING, "Failed to teleport new player", ex);
}
if (Essentials.getSettings().getAnnounceNewPlayers())
Essentials.getStatic().getServer().broadcastMessage(Essentials.getSettings().getAnnounceNewPlayerFormat(user));
if (Essentials.getStatic().getSettings().getAnnounceNewPlayers())
{
Essentials.getStatic().getServer().broadcastMessage(Essentials.getStatic().getSettings().getAnnounceNewPlayerFormat(user));
}
}
}

6
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnWorker.java
View File

@@ -16,7 +16,7 @@ public class EssentialsSpawnWorker
})
public static boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args)
{
User user = User.get(sender);
User user = Essentials.getStatic().getUser(sender);
IEssentialsCommand cmd;
try
@@ -42,9 +42,9 @@ public class EssentialsSpawnWorker
try
{
if (user == null)
cmd.run(Essentials.getStatic().getServer(), Essentials.getStatic(), sender, commandLabel, command, args);
cmd.run(Essentials.getStatic().getServer(), sender, commandLabel, command, args);
else
cmd.run(Essentials.getStatic().getServer(), Essentials.getStatic(), user, commandLabel, command, args);
cmd.run(Essentials.getStatic().getServer(), user, commandLabel, command, args);
return true;
}
catch (Exception ex)