Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inventory growth

Browse Source
This commit is contained in:
Xephi59 2015-06-11 00:22:59 +02:00
parent 5168a5d9e9
commit 4bb9dc53f1
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/fr/xephi/authme/cache/backup/FileCache.java vendored
View File

@ -3,6 +3,7 @@ package fr.xephi.authme.cache.backup;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Scanner; import java.util.Scanner;
import java.util.UUID; import java.util.UUID;
@ -51,7 +52,7 @@ public class FileCache {
File file = new File(plugin.getDataFolder() + File.separator + "cache" + File.separator + path + File.separator + "playerdatas.cache"); File file = new File(plugin.getDataFolder() + File.separator + "cache" + File.separator + path + File.separator + "playerdatas.cache");
if (!file.getParentFile().exists()) if (!file.getParentFile().exists())
file.getParentFile().mkdir(); file.getParentFile().mkdirs();
if (file.exists()) { if (file.exists()) {
return; return;
} }
@ -68,7 +69,7 @@ public class FileCache {
file = new File(plugin.getDataFolder() + File.separator + "cache" + File.separator + path + File.separator + "inventory"); file = new File(plugin.getDataFolder() + File.separator + "cache" + File.separator + path + File.separator + "inventory");
file.mkdir(); file.mkdirs();
ItemStack[] inv = playerData.getInventory(); ItemStack[] inv = playerData.getInventory();
for (int i = 0; i < inv.length; i++) { for (int i = 0; i < inv.length; i++) {
ItemStack item = inv[i]; ItemStack item = inv[i];
@ -108,14 +109,20 @@ public class FileCache {
if (Settings.customAttributes) { if (Settings.customAttributes) {
try { try {
Attributes attributes = new Attributes(item); Attributes attributes = new Attributes(item);
if (attributes != null) if (attributes != null) {
while (attributes.values().iterator().hasNext()) { Iterator<Attribute> iter = attributes.values().iterator();
Attribute a = attributes.values().iterator().next(); Attribute a = null;
while (iter.hasNext()) {
Attribute b = iter.next();
if (a != null && a == b)
break;
a = b;
if (a != null) { if (a != null) {
if (a.getName() != null && a.getAttributeType() != null && a.getOperation() != null && a.getUUID() != null) if (a.getName() != null && a.getAttributeType() != null && a.getOperation() != null && a.getUUID() != null)
writer.write("attribute=" + a.getName() + ";" + a.getAttributeType().getMinecraftId() + ";" + a.getAmount() + ";" + a.getOperation().getId() + ";" + a.getUUID().toString()); writer.write("attribute=" + a.getName() + ";" + a.getAttributeType().getMinecraftId() + ";" + a.getAmount() + ";" + a.getOperation().getId() + ";" + a.getUUID().toString());
} }
} }
}
} catch (Exception e) { } catch (Exception e) {
} catch (Error e) { } catch (Error e) {
} }
@ -128,8 +135,8 @@ public class FileCache {
file = new File(plugin.getDataFolder() + File.separator + "cache" + File.separator + path + File.separator + "armours"); file = new File(plugin.getDataFolder() + File.separator + "cache" + File.separator + path + File.separator + "armours");
if (!file.getParentFile().exists()) if (!file.getParentFile().exists())
file.getParentFile().mkdir(); file.getParentFile().mkdirs();
file.mkdir(); file.mkdirs();
ItemStack[] armors = playerData.getArmour(); ItemStack[] armors = playerData.getArmour();
for (int i = 0; i < armors.length; i++) { for (int i = 0; i < armors.length; i++) {
@ -393,8 +400,7 @@ public class FileCache {
line = line.substring(8); line = line.substring(8);
item.addEnchantment(Enchantment.getByName(line.split(":")[0]), Integer.parseInt(line.split(":")[1])); item.addEnchantment(Enchantment.getByName(line.split(":")[0]), Integer.parseInt(line.split(":")[1]));
} }
if (Settings.customAttributes) if (Settings.customAttributes) {
{
if (line.startsWith("attribute=")) { if (line.startsWith("attribute=")) {
if (attributes == null) if (attributes == null)
attributes = new Attributes(item); attributes = new Attributes(item);
@ -468,8 +474,7 @@ public class FileCache {
line = line.substring(8); line = line.substring(8);
item.addEnchantment(Enchantment.getByName(line.split(":")[0]), Integer.parseInt(line.split(":")[1])); item.addEnchantment(Enchantment.getByName(line.split(":")[0]), Integer.parseInt(line.split(":")[1]));
} }
if (Settings.customAttributes) if (Settings.customAttributes) {
{
if (line.startsWith("attribute=")) { if (line.startsWith("attribute=")) {
if (attributes == null) if (attributes == null)
attributes = new Attributes(item); attributes = new Attributes(item);