From 224c18348ae18ddd6c3e3de0f98a9d3f039e67d8 Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 1 May 2011 21:07:30 +0000 Subject: 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 --- .../earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'EssentialsGeoIP') diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java index 0037da209..071e9f6f7 100644 --- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java +++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java @@ -1,5 +1,6 @@ package com.earth2me.essentials.geoip; +import com.earth2me.essentials.Essentials; import com.earth2me.essentials.EssentialsConf; import com.earth2me.essentials.IConf; import com.earth2me.essentials.User; @@ -42,7 +43,8 @@ public class EssentialsGeoIPPlayerListener extends PlayerListener implements ICo @Override public void onPlayerJoin(PlayerJoinEvent event) { - User u = User.get(event.getPlayer()); + Essentials ess = Essentials.getStatic(); + User u = ess.getUser(event.getPlayer()); if (u.isAuthorized("essentials.geoip.hide")) { return; @@ -73,13 +75,13 @@ public class EssentialsGeoIPPlayerListener extends PlayerListener implements ICo } if (config.getBoolean("show-on-whois", true)) { - u.setMetadata("location", sb.toString()); + u.setGeoLocation(sb.toString()); } if (config.getBoolean("show-on-login", true)) { for (Player player : event.getPlayer().getServer().getOnlinePlayers()) { - User user = User.get(player); + User user = ess.getUser(player); if (user.isAuthorized("essentials.geoip.show")) { user.sendMessage("Player " + u.getDisplayName() + " comes from " + sb.toString()); } -- cgit v1.2.3