diff --git a/src/com/cypherx/xauth/Whirlpool.java b/src/com/cypherx/xauth/Whirlpool.java index a249aa0..8deaebb 100644 --- a/src/com/cypherx/xauth/Whirlpool.java +++ b/src/com/cypherx/xauth/Whirlpool.java @@ -1,3 +1,5 @@ +package com.cypherx.xauth; + /** * The Whirlpool hashing function. * diff --git a/src/com/cypherx/xauth/xAuth.java b/src/com/cypherx/xauth/xAuth.java index 6b1c511..02cb01d 100644 --- a/src/com/cypherx/xauth/xAuth.java +++ b/src/com/cypherx/xauth/xAuth.java @@ -49,8 +49,8 @@ public class xAuth extends JavaPlugin public static Settings settings; public static Strings strings; public static PermissionHandler Permissions; - - public static Plugin multiInv = null; + + //autosave test code private static Boolean fullyEnabled = false; private ConcurrentHashMap auths = new ConcurrentHashMap(); @@ -60,14 +60,7 @@ public class xAuth extends JavaPlugin private ConcurrentHashMap lastNotifyTimes = new ConcurrentHashMap(); public void onEnable() - { - multiInv = getServer().getPluginManager().getPlugin("MultiInv"); - - if (multiInv != null) - { - System.out.println("[xAuth] MultiInv detected, switching to compatibility mode"); - } - + { /*Whirlpool w = new Whirlpool(); byte[] digest = new byte[Whirlpool.DIGESTBYTES]; w.NESSIEinit(); @@ -106,8 +99,7 @@ public class xAuth extends JavaPlugin strings = new Strings(new File(DIR + STRINGS_FILE)); getAuths(); setupPermissions(); - - //REMOVE WHEN PERSISTENT SESSIONS ARE ADDED + //Hide inventory of any players online while server is starting (means /reload was used) Player[] players = getServer().getOnlinePlayers(); if (players.length > 0) @@ -118,36 +110,37 @@ public class xAuth extends JavaPlugin player.sendMessage(ChatColor.RED + "Server reloaded! You must log in again."); } } - //END REMOVE - - PluginManager pm = getServer().getPluginManager(); - pm.registerEvent(Event.Type.PLAYER_CHAT, playerListener, Priority.Highest, this); - pm.registerEvent(Event.Type.PLAYER_COMMAND_PREPROCESS, playerListener, Event.Priority.Normal, this); - pm.registerEvent(Event.Type.PLAYER_DROP_ITEM, playerListener, Event.Priority.Highest, this); - pm.registerEvent(Event.Type.PLAYER_PICKUP_ITEM, playerListener, Event.Priority.Highest, this); - pm.registerEvent(Event.Type.PLAYER_ITEM, playerListener, Event.Priority.Highest, this); + + PluginManager pm = getServer().getPluginManager(); + pm.registerEvent(Event.Type.PLAYER_CHAT, playerListener, Priority.Highest, this); + pm.registerEvent(Event.Type.PLAYER_COMMAND_PREPROCESS, playerListener, Event.Priority.Normal, this); + pm.registerEvent(Event.Type.PLAYER_DROP_ITEM, playerListener, Event.Priority.Highest, this); + pm.registerEvent(Event.Type.PLAYER_PICKUP_ITEM, playerListener, Event.Priority.Highest, this); + pm.registerEvent(Event.Type.PLAYER_ITEM, playerListener, Event.Priority.Highest, this); pm.registerEvent(Event.Type.PLAYER_JOIN, playerListener, Event.Priority.Highest, this); pm.registerEvent(Event.Type.PLAYER_MOVE, playerListener, Event.Priority.Highest, this); pm.registerEvent(Event.Type.PLAYER_QUIT, playerListener, Event.Priority.Highest, this); - + pm.registerEvent(Event.Type.BLOCK_BREAK, blockListener, Priority.Highest, this); //pm.registerEvent(Event.Type.BLOCK_DAMAGED, blockListener, Priority.Highest, this); pm.registerEvent(Event.Type.BLOCK_INTERACT, blockListener, Priority.Highest, this); pm.registerEvent(Event.Type.BLOCK_PLACED, blockListener, Priority.Highest, this); - + pm.registerEvent(Event.Type.ENTITY_DAMAGED, entityListener, Priority.Highest, this); pm.registerEvent(Event.Type.ENTITY_TARGET, entityListener, Priority.Highest, this); - + //PluginDescriptionFile pdfFile = this.getDescription(); - System.out.println("[" + pdfFile.getName() + "]" + " v" + pdfFile.getVersion() + " Enabled!"); - fullyEnabled = true; + System.out.println("[" + pdfFile.getName() + "]" + " v" + pdfFile.getVersion() + " Enabled!"); + + //autosave stuff + fullyEnabled = true; } public void getAuths() { PluginDescriptionFile pdfFile = this.getDescription(); System.out.println("[" + pdfFile.getName() + "] Loading player accounts.."); - + try { BufferedReader authReader = new BufferedReader(new FileReader(DIR + AUTH_FILE)); @@ -166,7 +159,7 @@ public class xAuth extends JavaPlugin System.out.println(e.getMessage()); } } - + public void onDisable() { //Restore players inventories so they are not lost @@ -177,10 +170,10 @@ public class xAuth extends JavaPlugin if (!sessionExists(player.getName())) restoreInventory(player); } - + if (fullyEnabled) updateAuthFile(); - + PluginDescriptionFile pdfFile = this.getDescription(); System.out.println("[" + pdfFile.getName() + "]" + " v" + pdfFile.getVersion() + " Disabled"); } @@ -330,8 +323,9 @@ public class xAuth extends JavaPlugin public void updateNotifyTime(Player player, Date date) { - lastNotifyTimes.remove(player); - lastNotifyTimes.put(player, date); + lastNotifyTimes.replace(player, date); + //lastNotifyTimes.remove(player); + //lastNotifyTimes.put(player, date); } //INVENTORY FUNCTIONS diff --git a/src/com/cypherx/xauth/xAuthPlayerListener.java b/src/com/cypherx/xauth/xAuthPlayerListener.java index 62c9325..11e904d 100644 --- a/src/com/cypherx/xauth/xAuthPlayerListener.java +++ b/src/com/cypherx/xauth/xAuthPlayerListener.java @@ -21,65 +21,22 @@ public class xAuthPlayerListener extends PlayerListener public void onPlayerJoin(PlayerEvent event) { - //PlayerInventory inv; - //ItemStack[] is; Player player = event.getPlayer(); if (!plugin.isLoggedIn(player)) { - /*System.out.println("[xAuth] :: Join - Before saving inventory"); - - inv = event.getPlayer().getInventory(); - is = inv.getContents(); - for (ItemStack item : is) - System.out.println(item.getType() + " : " + item.getAmount());*/ - plugin.saveInventory(player); - /*System.out.println("[xAuth] :: Join - After saving inventory"); - - inv = event.getPlayer().getInventory(); - is = inv.getContents(); - for (ItemStack item : is) - System.out.println(item.getType() + " : " + item.getAmount());*/ - if (!plugin.isRegistered(player.getName())) player.sendMessage(ChatColor.RED + "You are not registered. Please register using /register ."); else player.sendMessage(ChatColor.RED + "Please log in using /login ."); } - - /*if (!plugin.isRegistered(player.getName())) - { - plugin.saveInventory(player); - player.sendMessage(ChatColor.RED + "You are not registered. Please register using /register ."); - } - else if (!plugin.isLoggedIn(player)) - { - plugin.saveInventory(player); - player.sendMessage(ChatColor.RED + "Please log in using /login ."); - }*/ } public void onPlayerQuit(PlayerEvent event) { - /*PlayerInventory inv; - ItemStack[] is; - - System.out.println("[xAuth] :: Quit - Before restoring inventory"); - - inv = event.getPlayer().getInventory(); - is = inv.getContents(); - for (ItemStack item : is) - System.out.println(item.getType() + " : " + item.getAmount());*/ - plugin.logout(event.getPlayer()); - - /*System.out.println("[xAuth] :: Quit - After restoring inventory"); - inv = event.getPlayer().getInventory(); - is = inv.getContents(); - for (ItemStack item : is) - System.out.println(item.getType() + " : " + item.getAmount());*/ } //Prevents players from executing commands