From e6cc792cef130265c1904c7ff569571b59b02009 Mon Sep 17 00:00:00 2001 From: mathiascode Date: Fri, 24 Apr 2020 19:39:22 +0300 Subject: [PATCH] Prevent bookshelf pickup crash If no tool was involved in the creation of a bookshelf pickup (e.g. explosion), the server would crash due to a missing nullptr check. Removed the IsTool check completely, since we don't use it elsewhere, and vanilla doesn't do such checks either. --- src/Blocks/BlockBookShelf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Blocks/BlockBookShelf.h b/src/Blocks/BlockBookShelf.h index 477cb47b7..4d1afb1fa 100644 --- a/src/Blocks/BlockBookShelf.h +++ b/src/Blocks/BlockBookShelf.h @@ -17,7 +17,7 @@ class cBlockBookShelfHandler : virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override { - if ((ItemCategory::IsTool(a_Tool->m_ItemType)) && (ToolHasSilkTouch(a_Tool))) + if (ToolHasSilkTouch(a_Tool)) { return cItem(m_BlockType, 1); }