diff --git a/MobArena.jar b/MobArena.jar index 7d63672..e4ba0ee 100644 Binary files a/MobArena.jar and b/MobArena.jar differ diff --git a/build.xml b/build.xml index 0594cf0..bc7fe6c 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ - + diff --git a/resources/plugin.yml b/resources/plugin.yml index 872c9fb..322b331 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -1,7 +1,7 @@ name: MobArena author: garbagemule main: com.garbagemule.MobArena.MobArena -version: 0.94.4.79 +version: 0.94.4.80 softdepend: [Spout,MultiVerse,MultiWorld,XcraftGate,Towny,Heroes,MagicSpells,Vault] commands: ma: diff --git a/src/com/garbagemule/MobArena/ClassLimitManager.java b/src/com/garbagemule/MobArena/ClassLimitManager.java index 2f9b22d..df26116 100644 --- a/src/com/garbagemule/MobArena/ClassLimitManager.java +++ b/src/com/garbagemule/MobArena/ClassLimitManager.java @@ -6,7 +6,6 @@ import java.util.Map; import com.garbagemule.MobArena.framework.Arena; import com.garbagemule.MobArena.util.MutableInt; import com.garbagemule.MobArena.util.config.ConfigSection; -import com.garbagemule.MobArena.util.config.ConfigUtils; public class ClassLimitManager { diff --git a/src/com/garbagemule/MobArena/MobArena.java b/src/com/garbagemule/MobArena/MobArena.java index 32c80bc..8771e0d 100644 --- a/src/com/garbagemule/MobArena/MobArena.java +++ b/src/com/garbagemule/MobArena/MobArena.java @@ -113,7 +113,10 @@ public class MobArena extends JavaPlugin File file = new File(this.getDataFolder(), "config.yml"); config = new Config(file); - config.load(); + if (!config.load()) { + this.getServer().getPluginManager().disablePlugin(this); + throw new IllegalStateException("The config-file could not be loaded! Read further up to find the actual bug!"); + } updateSettings(config); config.setHeader(getHeader()); diff --git a/src/com/garbagemule/MobArena/listeners/MAGlobalListener.java b/src/com/garbagemule/MobArena/listeners/MAGlobalListener.java index fb868ba..221f129 100644 --- a/src/com/garbagemule/MobArena/listeners/MAGlobalListener.java +++ b/src/com/garbagemule/MobArena/listeners/MAGlobalListener.java @@ -284,6 +284,7 @@ public class MAGlobalListener implements Listener case REJECT: allow = false; break; + default: break; } } diff --git a/src/com/garbagemule/MobArena/util/config/Config.java b/src/com/garbagemule/MobArena/util/config/Config.java index 41a3bcd..6b67e3a 100644 --- a/src/com/garbagemule/MobArena/util/config/Config.java +++ b/src/com/garbagemule/MobArena/util/config/Config.java @@ -13,6 +13,8 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.inventory.ItemStack; +import com.garbagemule.MobArena.Messenger; + /** * Wrapper class for Bukkit's Configuration classes. * @@ -80,7 +82,7 @@ public class Config return true; } catch (Exception e) { - e.printStackTrace(); + Messenger.severe("The config-file failed to load. This is the error:\n" + e.getMessage()); return false; } }