diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-01-30 05:36:03 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-01-30 05:36:03 +0000 |
| commit | e2abf05a27b375fcb961156f5fb3cede8ac47b8f (patch) | |
| tree | 003f16dae160d64e1a37b58dde8ad2a1e1d1baec | |
| parent | d9e6f2975ac750073e488f940ccac3bcc6bfbf26 (diff) | |
| parent | 8500542e934ce30f9bff8148340c001973ce46bb (diff) | |
| download | Essentials-e2abf05a27b375fcb961156f5fb3cede8ac47b8f.tar Essentials-e2abf05a27b375fcb961156f5fb3cede8ac47b8f.tar.gz Essentials-e2abf05a27b375fcb961156f5fb3cede8ac47b8f.tar.lz Essentials-e2abf05a27b375fcb961156f5fb3cede8ac47b8f.tar.xz Essentials-e2abf05a27b375fcb961156f5fb3cede8ac47b8f.zip | |
Merge branch 'master' into release
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Settings.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index e50e9c16f..6b81753b6 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -374,6 +374,10 @@ public class Settings implements ISettings private List<Integer> getItemSpawnBlacklist() { final List<Integer> epItemSpwn = new ArrayList<Integer>(); + if (ess.getItemDb() == null) { + logger.log(Level.FINE, "Aborting ItemSpawnBL read, itemDB not yet loaded."); + return epItemSpwn; + } for (String itemName : config.getString("item-spawn-blacklist", "").split(",")) { itemName = itemName.trim(); |