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 | 098c4e5afdc3e26cfd3fec691ae0c2b3461a8ffe (patch) | |
| tree | f9b5c5381b6e3a7679e7902b6b305639818278b6 | |
| parent | e59029ec66a6290df8bf91534b26aa064f34c281 (diff) | |
| parent | 8bb14feca92603e5abbf877523cf93c8e77796e7 (diff) | |
| download | Essentials-098c4e5afdc3e26cfd3fec691ae0c2b3461a8ffe.tar Essentials-098c4e5afdc3e26cfd3fec691ae0c2b3461a8ffe.tar.gz Essentials-098c4e5afdc3e26cfd3fec691ae0c2b3461a8ffe.tar.lz Essentials-098c4e5afdc3e26cfd3fec691ae0c2b3461a8ffe.tar.xz Essentials-098c4e5afdc3e26cfd3fec691ae0c2b3461a8ffe.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(); |