summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Ward <chris@chrisgward.com>2013-01-09 00:48:04 +1100
committerChris Ward <chris@chrisgward.com>2013-01-09 00:48:04 +1100
commit9b58760bb4909b769a003a918be02dd4ab18174b (patch)
treeff53cb504469731b28124ae76f26bec037da6610
parenta8ecedab08cffaad7a6d92ed3e313613d946f84d (diff)
downloadEssentials-9b58760bb4909b769a003a918be02dd4ab18174b.tar
Essentials-9b58760bb4909b769a003a918be02dd4ab18174b.tar.gz
Essentials-9b58760bb4909b769a003a918be02dd4ab18174b.tar.lz
Essentials-9b58760bb4909b769a003a918be02dd4ab18174b.tar.xz
Essentials-9b58760bb4909b769a003a918be02dd4ab18174b.zip
Revert "Fix Spawns/Jail loading"
This reverts commit 55877e1d1abe22c4ddf1fed59e7827685cb073da.
-rw-r--r--Essentials/src/net/ess3/storage/BukkitConstructor.java5
1 files 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());