From 7ba37d75c90a7925e5b75c2f0cebac3dcd654e5b Mon Sep 17 00:00:00 2001 From: Xephi Date: Fri, 19 Sep 2014 00:52:09 +0200 Subject: [PATCH] Prevent some NPE on (auto)purge --- .../java/fr/xephi/authme/DataManager.java | 92 ++++++++++--------- .../java/fr/xephi/authme/SendMailSSL.java | 4 - 2 files changed, 50 insertions(+), 46 deletions(-) diff --git a/src/main/java/fr/xephi/authme/DataManager.java b/src/main/java/fr/xephi/authme/DataManager.java index 4c9f18f17..b43231291 100644 --- a/src/main/java/fr/xephi/authme/DataManager.java +++ b/src/main/java/fr/xephi/authme/DataManager.java @@ -43,15 +43,17 @@ public class DataManager extends Thread { public void purgeAntiXray(List cleared) { int i = 0; for (String name : cleared) { - org.bukkit.OfflinePlayer player = getOfflinePlayer(name); - if (player == null) - continue; - String playerName = player.getName(); - File playerFile = new File("." + File.separator + "plugins" + File.separator + "AntiXRayData" + File.separator + "PlayerData" + File.separator + playerName); - if (playerFile.exists()) { - playerFile.delete(); - i++; - } + try { + org.bukkit.OfflinePlayer player = getOfflinePlayer(name); + if (player == null) + continue; + String playerName = player.getName(); + File playerFile = new File("." + File.separator + "plugins" + File.separator + "AntiXRayData" + File.separator + "PlayerData" + File.separator + playerName); + if (playerFile.exists()) { + playerFile.delete(); + i++; + } + } catch (Exception e) {} } ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " AntiXRayData Files"); } @@ -59,25 +61,27 @@ public class DataManager extends Thread { public void purgeLimitedCreative(List cleared) { int i = 0; for (String name : cleared) { - org.bukkit.OfflinePlayer player = getOfflinePlayer(name); - if (player == null) - continue; - String playerName = player.getName(); - File playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + ".yml"); - if (playerFile.exists()) { - playerFile.delete(); - i++; - } - playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + "_creative.yml"); - if (playerFile.exists()) { - playerFile.delete(); - i++; - } - playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + "_adventure.yml"); - if (playerFile.exists()) { - playerFile.delete(); - i++; - } + try { + org.bukkit.OfflinePlayer player = getOfflinePlayer(name); + if (player == null) + continue; + String playerName = player.getName(); + File playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + ".yml"); + if (playerFile.exists()) { + playerFile.delete(); + i++; + } + playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + "_creative.yml"); + if (playerFile.exists()) { + playerFile.delete(); + i++; + } + playerFile = new File("." + File.separator + "plugins" + File.separator + "LimitedCreative" + File.separator + "inventories" + File.separator + playerName + "_adventure.yml"); + if (playerFile.exists()) { + playerFile.delete(); + i++; + } + } catch (Exception e) {} } ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " LimitedCreative Survival, Creative and Adventure files"); } @@ -85,15 +89,17 @@ public class DataManager extends Thread { public void purgeDat(List cleared) { int i = 0; for (String name : cleared) { - org.bukkit.OfflinePlayer player = getOfflinePlayer(name); - if (player == null) - continue; - String playerName = player.getName(); - File playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + playerName + ".dat"); - if (playerFile.exists()) { - playerFile.delete(); - i++; - } + try { + org.bukkit.OfflinePlayer player = getOfflinePlayer(name); + if (player == null) + continue; + String playerName = player.getName(); + File playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + playerName + ".dat"); + if (playerFile.exists()) { + playerFile.delete(); + i++; + } + } catch (Exception e) {} } ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " .dat Files"); } @@ -101,11 +107,13 @@ public class DataManager extends Thread { public void purgeEssentials(List cleared) { int i = 0; for (String name : cleared) { - File playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + name + ".yml"); - if (playerFile.exists()) { - playerFile.delete(); - i++; - } + try { + File playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + name + ".yml"); + if (playerFile.exists()) { + playerFile.delete(); + i++; + } + } catch (Exception e) {} } ConsoleLogger.info("AutoPurgeDatabase : Remove " + i + " EssentialsFiles"); } diff --git a/src/main/java/fr/xephi/authme/SendMailSSL.java b/src/main/java/fr/xephi/authme/SendMailSSL.java index 151592125..a28160167 100644 --- a/src/main/java/fr/xephi/authme/SendMailSSL.java +++ b/src/main/java/fr/xephi/authme/SendMailSSL.java @@ -45,14 +45,12 @@ public class SendMailSSL { props.put("mail.smtp.port", String.valueOf(Settings.getMailPort)); Session session = Session.getInstance(props, new javax.mail.Authenticator() { - protected PasswordAuthentication getPasswordAuthentication() { return new PasswordAuthentication(Settings.getmailAccount, Settings.getmailPassword); } }); try { - final Message message = new MimeMessage(session); try { message.setFrom(new InternetAddress(Settings.getmailAccount, sendername)); @@ -68,7 +66,6 @@ public class SendMailSSL { text = text.replace("", newPass); message.setContent(text, "text/html"); Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() { - @Override public void run() { try { @@ -84,5 +81,4 @@ public class SendMailSSL { throw new RuntimeException(e); } } - }