Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-18 08:35:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix Spawns / Jail loading

Browse Source
This commit is contained in:
snowleo 2012-12-19 23:26:29 +01:00
parent f9bcc3100c
commit c028c385b6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java
View File

@ -13,22 +13,22 @@ import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.material.MaterialData; import org.bukkit.material.MaterialData;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPluginLoader;
import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.constructor.Constructor;
import org.yaml.snakeyaml.constructor.CustomClassLoaderConstructor;
import org.yaml.snakeyaml.error.YAMLException; import org.yaml.snakeyaml.error.YAMLException;
import org.yaml.snakeyaml.introspector.Property; import org.yaml.snakeyaml.introspector.Property;
import org.yaml.snakeyaml.nodes.*; 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 Pattern NUMPATTERN = Pattern.compile("\\d+");
private final transient Plugin plugin; private final transient Plugin plugin;
public BukkitConstructor(final Class clazz, final Plugin plugin) public BukkitConstructor(final Class clazz, final Plugin plugin)
{ {
super(clazz); super(clazz, plugin.getClass().getClassLoader());
this.plugin = plugin; this.plugin = plugin;
yamlClassConstructors.put(NodeId.scalar, new ConstructBukkitScalar()); yamlClassConstructors.put(NodeId.scalar, new ConstructBukkitScalar());
yamlClassConstructors.put(NodeId.mapping, new ConstructBukkitMapping()); yamlClassConstructors.put(NodeId.mapping, new ConstructBukkitMapping());
@ -276,6 +276,7 @@ public class BukkitConstructor extends Constructor
return super.construct(node); return super.construct(node);
} }
@Override
protected Object constructJavaBean2ndStep(final MappingNode node, final Object object) protected Object constructJavaBean2ndStep(final MappingNode node, final Object object)
{ {
Map<Class<? extends Object>, TypeDescription> typeDefinitions; Map<Class<? extends Object>, TypeDescription> typeDefinitions;