cdanesi/PlayerVaults
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unique id converstion. fixes #51

Browse Source
This commit is contained in:
Joshua Popoff
2014-11-09 01:17:39 -08:00
parent 9ce0d572be
commit e8bbd49804
2 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/PlayerVaults.java
+8 -5
View File
@@ -55,17 +55,15 @@ public class PlayerVaults extends JavaPlugin {
private boolean saveQueued; private boolean saveQueued;
private String name = ""; private String name = "";
private File configFile; private File configFile;
private File backupsFolder; private File backupsFolder = null;
private File vaultData; private File vaultData;
@Override @Override
public void onEnable() { public void onEnable() {
instance = this; instance = this;
backupsFolder = new File(this.getVaultData(), "backups");
backupsFolder.mkdirs();
configFile = new File(getDataFolder(), "config.yml"); configFile = new File(getDataFolder(), "config.yml");
vaultData = new File(this.getDataFolder(), "uuidvaults"); vaultData = new File(this.getDataFolder(), "uuidvaults");
getServer().getScheduler().runTask(this, new UUIDConversion()); // Convert to UUID first. Class checks if necessary. getServer().getScheduler().runTask(this, new UUIDConversion()); // Convert to UUIDs first. Class checks if necessary.
loadLang(); loadLang();
new UUIDVaultManager(); new UUIDVaultManager();
getServer().getPluginManager().registerEvents(new Listeners(this), this); getServer().getPluginManager().registerEvents(new Listeners(this), this);
@@ -100,7 +98,6 @@ public class PlayerVaults extends JavaPlugin {
@Override @Override
public void onDisable() { public void onDisable() {
for (Player player : Bukkit.getOnlinePlayers()) { for (Player player : Bukkit.getOnlinePlayers()) {
if (this.inVault.containsKey(player.getName())) { if (this.inVault.containsKey(player.getName())) {
Inventory inventory = player.getOpenInventory().getTopInventory(); Inventory inventory = player.getOpenInventory().getTopInventory();
@@ -342,6 +339,12 @@ public class PlayerVaults extends JavaPlugin {
} }
public File getBackupsFolder() { public File getBackupsFolder() {
// having this in #onEnable() creates the 'uuidvaults' directory, preventing the conversion from running
if (this.backupsFolder == null) {
this.backupsFolder = new File(this.getVaultData(), "backups");
this.backupsFolder.mkdirs();
}
return this.backupsFolder; return this.backupsFolder;
} }
src/main/java/com/drtshock/playervaults/tasks/UUIDConversion.java
+15 -10
View File
@@ -8,7 +8,7 @@ import org.bukkit.scheduler.BukkitRunnable;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.logging.Level; import java.util.logging.Logger;
/** /**
* Class to convert vaults by name to vaults by UUID. * Class to convert vaults by name to vaults by UUID.
@@ -16,23 +16,27 @@ import java.util.logging.Level;
public final class UUIDConversion extends BukkitRunnable { public final class UUIDConversion extends BukkitRunnable {
@Override @Override
public void run() { public void run() {
Logger logger = PlayerVaults.getInstance().getLogger();
File newDir = PlayerVaults.getInstance().getVaultData(); File newDir = PlayerVaults.getInstance().getVaultData();
if (newDir.exists()) { if (newDir.exists()) {
PlayerVaults.getInstance().getLogger().log(Level.INFO, "Files already converted to UUID."); logger.info("** Vaults have already been converted to UUIDs. If this is incorrect, shutdown your server and rename the " + newDir.toString() + " directory.");
return; return;
} }
newDir.mkdirs(); newDir.mkdirs();
PlayerVaults.getInstance().getLogger().log(Level.INFO, "********** Starting PlayerVault conversion to UUIDs **********"); File oldVaults = new File(PlayerVaults.getInstance().getDataFolder() + File.separator + "vaults");
PlayerVaults.getInstance().getLogger().log(Level.INFO, "This might take awhile."); if (oldVaults.exists()) {
PlayerVaults.getInstance().getLogger().log(Level.INFO, "plugins/PlayerVaults/vaults will remain as a backup."); logger.info("********** Starting conversion to UUIDs **********");
logger.info("This might take awhile.");
logger.info(oldVaults.toString() + " will remain as a backup.");
for (File file : new File(PlayerVaults.getInstance().getDataFolder() + File.separator + "vaults").listFiles()) { for (File file : oldVaults.listFiles()) {
if (file.isDirectory()) continue; // backups folder. if (file.isDirectory()) continue; // backups folder.
OfflinePlayer player = Bukkit.getOfflinePlayer(file.getName().replace(".yml", "")); OfflinePlayer player = Bukkit.getOfflinePlayer(file.getName().replace(".yml", ""));
if (player == null) { if (player == null) {
PlayerVaults.getInstance().getLogger().log(Level.WARNING, "Unable to convert file because player never joined the server: " + file.getName()); logger.warning("Unable to convert file because player never joined the server: " + file.getName());
break; break;
} }
@@ -40,12 +44,13 @@ public final class UUIDConversion extends BukkitRunnable {
file.mkdirs(); file.mkdirs();
try { try {
Files.copy(file, newFile); Files.copy(file, newFile);
PlayerVaults.getInstance().getLogger().log(Level.INFO, "Successfully converted vault file for " + player.getName()); logger.info("Successfully converted vault file for " + player.getName());
} catch (IOException e) { } catch (IOException e) {
PlayerVaults.getInstance().getLogger().log(Level.SEVERE, "Couldn't convert vault file for " + player.getName()); logger.severe("Couldn't convert vault file for " + player.getName());
} }
} }
PlayerVaults.getInstance().getLogger().log(Level.INFO, "********** Conversion done ;D **********"); logger.info("********** Conversion done ;D **********");
}
} }
} }