Attempt to fix username.yml issues
This commit is contained in:
@@ -20,7 +20,6 @@ import com.drtshock.playervaults.PlayerVaults;
|
||||
import com.drtshock.playervaults.util.Lang;
|
||||
import com.drtshock.playervaults.vaultmanagement.UUIDVaultManager;
|
||||
import com.drtshock.playervaults.vaultmanagement.VaultViewInfo;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.entity.EntityType;
|
||||
@@ -40,8 +39,6 @@ import org.bukkit.event.player.PlayerTeleportEvent;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public class Listeners implements Listener {
|
||||
|
||||
@@ -55,17 +52,20 @@ public class Listeners implements Listener {
|
||||
public void saveVault(Player player, Inventory inventory) {
|
||||
if (plugin.getInVault().containsKey(player.getUniqueId().toString())) {
|
||||
|
||||
Inventory inv = Bukkit.createInventory(null, 6 * 9);
|
||||
inv.setContents(inventory.getContents().clone());
|
||||
VaultViewInfo info = plugin.getInVault().get(player.getUniqueId().toString());
|
||||
Inventory inv = Bukkit.createInventory(null, 6 * 9);
|
||||
inv.setContents(inventory.getContents().clone());
|
||||
|
||||
if (inventory.getViewers().size() == 1) {
|
||||
VaultViewInfo info = plugin.getInVault().get(player.getUniqueId().toString());
|
||||
String target = info.getHolderUUID() != null ? info.getHolderUUID().toString() : info.getHolder();
|
||||
vaultManager.saveVault(inv, target, info.getNumber());
|
||||
if (inventory.getViewers().size() == 1 || info.getHolderUUID() == null) {
|
||||
// DON'T save when others are viewing. Caused saving as username.yml
|
||||
// TODO: verify this doesn't break faction / group vaults.
|
||||
return;
|
||||
}
|
||||
|
||||
plugin.getOpenInventories().remove(info.toString());
|
||||
}
|
||||
String target = info.getHolderUUID().toString();
|
||||
vaultManager.saveVault(inv, target, info.getNumber());
|
||||
|
||||
plugin.getOpenInventories().remove(info.toString());
|
||||
plugin.getInVault().remove(player.getUniqueId().toString());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user