Chronika/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Configurations now properly support lists of serializable objects, and ItemStack is properly serializable. Big thanks to GICodeWarrior for the PR. This fixes BUKKIT-425

Browse Source
This commit is contained in:
Nathan Adams
2012-01-15 11:15:19 +00:00
parent c84c5a2132
commit 0023c705eb
7 changed files with 143 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/bukkit/configuration/MemorySection.java
View File

@@ -189,7 +189,7 @@ public class MemorySection implements ConfigurationSection {
if (value == null) {
map.remove(key);
} else {
map.put(key, prepForStorage(value));
map.put(key, value);
}
} else {
section.set(key, value);
@@ -905,20 +905,6 @@ public class MemorySection implements ConfigurationSection {
return val instanceof ConfigurationSection;
}
protected Object prepForStorage(Object input) {
if (input == null) {
throw new IllegalArgumentException("Cannot store null");
}
if (isPrimitiveWrapper(input) || isNaturallyStorable(input)) {
return input;
} else if (input instanceof ConfigurationSerializable) {
return input;
}
throw new IllegalArgumentException("Cannot store " + input + " into " + this + ", unsupported class");
}
protected boolean isPrimitiveWrapper(Object input) {
return input instanceof Integer || input instanceof Boolean ||
input instanceof Character || input instanceof Byte ||
@@ -926,12 +912,6 @@ public class MemorySection implements ConfigurationSection {
input instanceof Long || input instanceof Float;
}
protected boolean isNaturallyStorable(Object input) {
return input instanceof List || input instanceof Iterable ||
input instanceof String || input instanceof File ||
input instanceof Enum;
}
protected Object getDefault(String path) {
if (path == null) {
throw new IllegalArgumentException("Path cannot be null");