diff options
| author | snowleo <schneeleo@gmail.com> | 2012-12-19 23:26:29 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-12-20 00:46:03 +0100 |
| commit | c028c385b682bccbb682ce6af1a34b6b30ab43e8 (patch) | |
| tree | 24321c3030dd3ba6aea2a86277c11a38ea57ca6b | |
| parent | f9bcc3100cd385617fe1d759064e85414a0947fa (diff) | |
| download | Essentials-c028c385b682bccbb682ce6af1a34b6b30ab43e8.tar Essentials-c028c385b682bccbb682ce6af1a34b6b30ab43e8.tar.gz Essentials-c028c385b682bccbb682ce6af1a34b6b30ab43e8.tar.lz Essentials-c028c385b682bccbb682ce6af1a34b6b30ab43e8.tar.xz Essentials-c028c385b682bccbb682ce6af1a34b6b30ab43e8.zip | |
Fix Spawns / Jail loading
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java b/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java index e5fc19ea3..8c12acfe3 100644 --- a/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java +++ b/Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java @@ -13,22 +13,22 @@ import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.bukkit.material.MaterialData; import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.java.JavaPluginLoader; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.constructor.Constructor; +import org.yaml.snakeyaml.constructor.CustomClassLoaderConstructor; import org.yaml.snakeyaml.error.YAMLException; import org.yaml.snakeyaml.introspector.Property; import org.yaml.snakeyaml.nodes.*; -public class BukkitConstructor extends Constructor +public class BukkitConstructor extends CustomClassLoaderConstructor { private final transient Pattern NUMPATTERN = Pattern.compile("\\d+"); private final transient Plugin plugin; public BukkitConstructor(final Class clazz, final Plugin plugin) { - super(clazz); + super(clazz, plugin.getClass().getClassLoader()); this.plugin = plugin; yamlClassConstructors.put(NodeId.scalar, new ConstructBukkitScalar()); yamlClassConstructors.put(NodeId.mapping, new ConstructBukkitMapping()); @@ -276,6 +276,7 @@ public class BukkitConstructor extends Constructor return super.construct(node); } + @Override protected Object constructJavaBean2ndStep(final MappingNode node, final Object object) { Map<Class<? extends Object>, TypeDescription> typeDefinitions; |