mirror of
https://github.com/essentials/Essentials.git
synced 2025-08-14 02:24:16 +02: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:
@@ -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()));
|
||||
}
|
||||
|
@@ -40,11 +40,11 @@ public class EssentialsProtectBlockListener extends BlockListener
|
||||
if (event.isCancelled()) return;
|
||||
initialize();
|
||||
ItemStack item = event.getItemInHand();
|
||||
User user = User.get(event.getPlayer());
|
||||
User user = Essentials.getStatic().getUser(event.getPlayer());
|
||||
|
||||
if (EssentialsProtect.playerSettings.get("protect.disable.build") && !user.canBuild())
|
||||
{
|
||||
if(Essentials.getSettings().warnOnBuildDisallow())
|
||||
if(Essentials.getStatic().getSettings().warnOnBuildDisallow())
|
||||
{
|
||||
user.sendMessage(ChatColor.RED + "You are not permitted to build");
|
||||
}
|
||||
@@ -227,7 +227,7 @@ public class EssentialsProtectBlockListener extends BlockListener
|
||||
{
|
||||
if (event.isCancelled()) return;
|
||||
initialize();
|
||||
User user = User.get(event.getPlayer());
|
||||
User user = Essentials.getStatic().getUser(event.getPlayer());
|
||||
Block block = event.getBlock();
|
||||
if (EssentialsProtect.playerSettings.get("protect.disable.build") && !user.canBuild())
|
||||
{
|
||||
|
@@ -76,8 +76,8 @@ public class EssentialsProtectEntityListener extends EntityListener
|
||||
{
|
||||
if (EssentialsProtect.playerSettings.get("protect.disable.pvp"))
|
||||
{
|
||||
User defender = User.get(eDefend);
|
||||
User attacker = User.get(eAttack);
|
||||
User defender = Essentials.getStatic().getUser(eDefend);
|
||||
User attacker = Essentials.getStatic().getUser(eAttack);
|
||||
|
||||
if (!defender.isAuthorized("essentials.protect.pvp") || !attacker.isAuthorized("essentials.protect.pvp"))
|
||||
{
|
||||
@@ -153,7 +153,7 @@ public class EssentialsProtectEntityListener extends EntityListener
|
||||
if (event.getEntity() instanceof LivingEntity)
|
||||
{
|
||||
//Nicccccccccce plaaacccccccccce..
|
||||
int maxHeight = Essentials.getSettings().getEpCreeperMaxHeight();
|
||||
int maxHeight = Essentials.getStatic().getSettings().getEpCreeperMaxHeight();
|
||||
if (EssentialsProtect.guardSettings.get("protect.prevent.creeper-explosion")
|
||||
|| EssentialsProtect.guardSettings.get("protect.prevent.creeper-blockdamage")
|
||||
|| (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight))
|
||||
@@ -246,7 +246,7 @@ public class EssentialsProtectEntityListener extends EntityListener
|
||||
if (!(event.getTarget() instanceof Player)) {
|
||||
return;
|
||||
}
|
||||
User user = User.get(event.getTarget());
|
||||
User user = Essentials.getStatic().getUser(event.getTarget());
|
||||
if ((event.getReason() == TargetReason.CLOSEST_PLAYER ||
|
||||
event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY ||
|
||||
event.getReason() == TargetReason.PIG_ZOMBIE_TARGET) &&
|
||||
|
@@ -34,12 +34,12 @@ public class EssentialsProtectPlayerListener extends PlayerListener
|
||||
initialize();
|
||||
if (event.isCancelled()) return;
|
||||
ItemStack item = event.getItem();
|
||||
User user = User.get(event.getPlayer());
|
||||
User user = Essentials.getStatic().getUser(event.getPlayer());
|
||||
Block blockClicked = event.getClickedBlock();
|
||||
|
||||
if (EssentialsProtect.playerSettings.get("protect.disable.build") && !user.canBuild())
|
||||
{
|
||||
if(Essentials.getSettings().warnOnBuildDisallow())
|
||||
if(Essentials.getStatic().getSettings().warnOnBuildDisallow())
|
||||
{
|
||||
user.sendMessage(ChatColor.RED + "You are not permitted to build");
|
||||
}
|
||||
|
Reference in New Issue
Block a user