From 4b42e30be64b0c356790312cd8e239bb579121c4 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Fri, 17 Jun 2016 20:10:12 +0200 Subject: [PATCH] Add safety checks to the book UI when the player is lost (death/dimension change should can cause that) --- src/main/java/slimeknights/mantle/client/book/BookLoader.java | 3 +++ src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/slimeknights/mantle/client/book/BookLoader.java b/src/main/java/slimeknights/mantle/client/book/BookLoader.java index 951f0dd..836fa0d 100644 --- a/src/main/java/slimeknights/mantle/client/book/BookLoader.java +++ b/src/main/java/slimeknights/mantle/client/book/BookLoader.java @@ -155,6 +155,9 @@ public class BookLoader implements IResourceManagerReloadListener { } public static void updateSavedPage(EntityPlayer player, ItemStack item, String page) { + if(player == null) { + return; + } if(player.getHeldItem(EnumHand.MAIN_HAND) == null) { return; } diff --git a/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java b/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java index de42732..791001b 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/GuiBook.java @@ -570,6 +570,9 @@ public class GuiBook extends GuiScreen implements IProgressMeter { if(loadingAchievements) { return; } + if(mc.thePlayer == null) { + return; + } PageData page = this.page == 0 ? book.findPage(0, statisticsManager) : book.findPage((this.page - 1) * 2 + 1, statisticsManager);