summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-04-01 09:59:24 +0200
committerErik Broes <erikbroes@grum.nl>2011-04-01 09:59:24 +0200
commit8b7ac0b39efef6e069bc044164fa440c4b5ee8a7 (patch)
tree43e00b80a94de33a8a4a8759a065e09b5403efbb
parent0d98e831cc39dd91355f21540ce7b322e909c49b (diff)
downloadbukkit-8b7ac0b39efef6e069bc044164fa440c4b5ee8a7.tar
bukkit-8b7ac0b39efef6e069bc044164fa440c4b5ee8a7.tar.gz
bukkit-8b7ac0b39efef6e069bc044164fa440c4b5ee8a7.tar.lz
bukkit-8b7ac0b39efef6e069bc044164fa440c4b5ee8a7.tar.xz
bukkit-8b7ac0b39efef6e069bc044164fa440c4b5ee8a7.zip
Catch YAML exceptions as InvalidPluginExceptions
-rw-r--r--src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index bed11a9e..42d893d5 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -24,6 +24,7 @@ import org.bukkit.event.server.*;
import org.bukkit.event.vehicle.*;
import org.bukkit.event.world.*;
import org.bukkit.plugin.*;
+import org.yaml.snakeyaml.error.YAMLException;
/**
* Represents a Java plugin loader, allowing plugins in the form of .jar
@@ -62,6 +63,8 @@ public final class JavaPluginLoader implements PluginLoader {
jar.close();
} catch (IOException ex) {
throw new InvalidPluginException(ex);
+ } catch (YAMLException ex) {
+ throw new InvalidPluginException(ex);
}
File dataFolder = getDataFolder(file);