From 9b58760bb4909b769a003a918be02dd4ab18174b Mon Sep 17 00:00:00 2001 From: Chris Ward Date: Wed, 9 Jan 2013 00:48:04 +1100 Subject: Revert "Fix Spawns/Jail loading" This reverts commit 55877e1d1abe22c4ddf1fed59e7827685cb073da. --- Essentials/src/net/ess3/storage/BukkitConstructor.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Essentials/src/net/ess3/storage/BukkitConstructor.java b/Essentials/src/net/ess3/storage/BukkitConstructor.java index 6d35c1bd5..819fe4b81 100644 --- a/Essentials/src/net/ess3/storage/BukkitConstructor.java +++ b/Essentials/src/net/ess3/storage/BukkitConstructor.java @@ -13,13 +13,12 @@ import net.ess3.Essentials; import net.ess3.api.IPlugin; 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 CustomClassLoaderConstructor +public class BukkitConstructor extends Constructor { private final transient Pattern NUMPATTERN = Pattern.compile("\\d+"); private final transient Pattern DATAPATTERN = Pattern.compile("[:+',;.]"); @@ -28,7 +27,7 @@ public class BukkitConstructor extends CustomClassLoaderConstructor public BukkitConstructor(final Class clazz, final IPlugin plugin) { - super(clazz, plugin.getClass().getClassLoader()); + super(clazz); this.plugin = plugin; yamlClassConstructors.put(NodeId.scalar, new ConstructBukkitScalar()); yamlClassConstructors.put(NodeId.mapping, new ConstructBukkitMapping()); -- cgit v1.2.3