diff options
author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-01 21:07:30 +0000 |
---|---|---|
committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-01 21:07:30 +0000 |
commit | 224c18348ae18ddd6c3e3de0f98a9d3f039e67d8 (patch) | |
tree | 73c8b72c8c81258853d73874bd841452d93eb969 /EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java | |
parent | 03fd6249fc61f15d7e153ae66bccc77b0dc36447 (diff) | |
download | Essentials-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 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java')
-rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java index 7a0baecdb..6458558e0 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java @@ -97,16 +97,16 @@ public class EssentialsProtect extends JavaPlugin public static void loadSettings() { - dataSettings = Essentials.getSettings().getEpDBSettings(); - genSettings = Essentials.getSettings().getEpSettings(); - guardSettings = Essentials.getSettings().getEpGuardSettings(); - usageList = Essentials.getSettings().epBlackListUsage(); - blackListPlace = Essentials.getSettings().epBlackListPlacement(); - breakBlackList = Essentials.getSettings().epBlockBreakingBlacklist(); - onPlaceAlert = Essentials.getSettings().getEpAlertOnPlacement(); - onUseAlert = Essentials.getSettings().getEpAlertOnUse(); - onBreakAlert = Essentials.getSettings().getEpAlertOnBreak(); - playerSettings = Essentials.getSettings().getEpPlayerSettings(); + dataSettings = Essentials.getStatic().getSettings().getEpDBSettings(); + genSettings = Essentials.getStatic().getSettings().getEpSettings(); + guardSettings = Essentials.getStatic().getSettings().getEpGuardSettings(); + usageList = Essentials.getStatic().getSettings().epBlackListUsage(); + blackListPlace = Essentials.getStatic().getSettings().epBlackListPlacement(); + breakBlackList = Essentials.getStatic().getSettings().epBlockBreakingBlacklist(); + onPlaceAlert = Essentials.getStatic().getSettings().getEpAlertOnPlacement(); + onUseAlert = Essentials.getStatic().getSettings().getEpAlertOnUse(); + onBreakAlert = Essentials.getStatic().getSettings().getEpAlertOnBreak(); + playerSettings = Essentials.getStatic().getSettings().getEpPlayerSettings(); EssentialsProtectData.createSqlTable(); } @@ -115,7 +115,7 @@ public class EssentialsProtect extends JavaPlugin Location loc = user.getLocation(); for (Player p : this.getServer().getOnlinePlayers()) { - User alertUser = User.get(p); + User alertUser = Essentials.getStatic().getUser(p); if (alertUser.isAuthorized("essentials.protect.alerts")) alertUser.sendMessage(ChatColor.DARK_AQUA + "[" + user.getName() + "] " + ChatColor.WHITE + type + ChatColor.GOLD + item + " at: " + EssentialsProtectData.formatCoords(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); } |