Fix saving of vaults and use guava Files instead of nms apache commons Files
This commit is contained in:
@@ -66,7 +66,7 @@
|
||||
<dependency>
|
||||
<groupId>net.milkbowl.vault</groupId>
|
||||
<artifactId>Vault</artifactId>
|
||||
<version>1.2.25-SNAPSHOT</version>
|
||||
<version>1.2.32</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
@@ -81,7 +81,7 @@
|
||||
</repository>
|
||||
<repository>
|
||||
<id>vault-repo</id>
|
||||
<url>http://ci.herocraftonline.com/plugin/repository/everything</url>
|
||||
<url>http://nexus.theyeticave.net/content/repositories/pub_releases/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
|
||||
@@ -19,7 +19,6 @@ package com.drtshock.playervaults.listeners;
|
||||
import com.drtshock.playervaults.PlayerVaults;
|
||||
import com.drtshock.playervaults.util.Lang;
|
||||
import com.drtshock.playervaults.vaultmanagement.UUIDVaultManager;
|
||||
import com.drtshock.playervaults.vaultmanagement.VaultManager;
|
||||
import com.drtshock.playervaults.vaultmanagement.VaultOperations;
|
||||
import com.drtshock.playervaults.vaultmanagement.VaultViewInfo;
|
||||
import org.bukkit.*;
|
||||
@@ -49,7 +48,7 @@ public class Listeners implements Listener {
|
||||
this.plugin = playerVaults;
|
||||
}
|
||||
|
||||
VaultManager vm = new VaultManager(plugin);
|
||||
UUIDVaultManager vm = UUIDVaultManager.getInstance();
|
||||
|
||||
public void saveVault(Player player) {
|
||||
if (PlayerVaults.getInstance().getInVault().containsKey(player.getName())) {
|
||||
@@ -57,7 +56,7 @@ public class Listeners implements Listener {
|
||||
if (inv.getViewers().size() == 1) {
|
||||
VaultViewInfo info = PlayerVaults.getInstance().getInVault().get(player.getName());
|
||||
try {
|
||||
vm.saveVault(inv, info.getHolder(), info.getNumber());
|
||||
vm.saveVault(inv, player.getUniqueId(), info.getNumber());
|
||||
} catch (IOException e) {
|
||||
}
|
||||
PlayerVaults.getInstance().getOpenInventories().remove(info.toString());
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.drtshock.playervaults.tasks;
|
||||
|
||||
import com.drtshock.playervaults.PlayerVaults;
|
||||
import net.minecraft.util.org.apache.commons.io.FileUtils;
|
||||
import com.google.common.io.Files;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
@@ -36,16 +36,18 @@ public final class UUIDConversion extends BukkitRunnable {
|
||||
PlayerVaults.getInstance().getLogger().log(Level.WARNING, "Unable to convert file because player never joined the server: " + file.getName());
|
||||
break;
|
||||
}
|
||||
|
||||
UUID uuid = player.getUniqueId();
|
||||
File newFile = new File(PlayerVaults.getInstance().getDataFolder(), "uuidvaults" + File.separator + uuid.toString() + ".yml");
|
||||
file.mkdirs();
|
||||
try {
|
||||
FileUtils.copyFile(file, newFile);
|
||||
Files.copy(file, newFile);
|
||||
PlayerVaults.getInstance().getLogger().log(Level.INFO, "Successfully converted vault file for " + player.getName());
|
||||
} catch (IOException e) {
|
||||
PlayerVaults.getInstance().getLogger().log(Level.SEVERE, "Couldn't convert vault file for " + player.getName());
|
||||
}
|
||||
}
|
||||
|
||||
PlayerVaults.getInstance().getLogger().log(Level.INFO, "********** Conversion done ;D **********");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user