From 281beba50e3e6cb9ba37182305487b4b83c385b4 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Fri, 25 Sep 2020 10:59:08 +0000 Subject: Fix the build. Merge conflict between two PRs (#4936) --- src/Blocks/BlockPackedIce.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Blocks/BlockPackedIce.h b/src/Blocks/BlockPackedIce.h index e344b2a19..cad82d121 100644 --- a/src/Blocks/BlockPackedIce.h +++ b/src/Blocks/BlockPackedIce.h @@ -18,7 +18,7 @@ public: private: - virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) const override + virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, const cEntity * a_Digger, const cItem * a_Tool) const override { // Only drop self when using silk-touch: if (ToolHasSilkTouch(a_Tool)) -- cgit v1.2.3