diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-28 18:57:56 +0100 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-28 18:57:56 +0100 |
| commit | 08996835da4c2c0cc1db0742c358e3cee551323b (patch) | |
| tree | f4159480176d7e57a37a4f4df53864a11fde19b4 | |
| parent | eae50b4f2af2740d02c71a3d78bbc8a1dd8ebcd1 (diff) | |
| parent | e8e3ca29e250f38be86e7c97f0bf03cec5374693 (diff) | |
| download | craftbukkit-08996835da4c2c0cc1db0742c358e3cee551323b.tar craftbukkit-08996835da4c2c0cc1db0742c358e3cee551323b.tar.gz craftbukkit-08996835da4c2c0cc1db0742c358e3cee551323b.tar.lz craftbukkit-08996835da4c2c0cc1db0742c358e3cee551323b.tar.xz craftbukkit-08996835da4c2c0cc1db0742c358e3cee551323b.zip | |
Merge pull request #75 in SPIGOT/craftbukkit from ~XOR/craftbukkit:fixbookserial to master
* commit 'e8e3ca29e250f38be86e7c97f0bf03cec5374693':
Add null check before iterating over iterator.
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java index a76ae7d7..42ecde7e 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java @@ -99,9 +99,11 @@ class CraftMetaBook extends CraftMetaItem implements BookMeta { setTitle(SerializableMeta.getString(map, BOOK_TITLE.BUKKIT, true)); Iterable<?> pages = SerializableMeta.getObject(Iterable.class, map, BOOK_PAGES.BUKKIT, true); - for (Object page : pages) { - if (page instanceof String) { - addPage((String) page); + if(pages != null) { + for (Object page : pages) { + if (page instanceof String) { + addPage((String) page); + } } } |