flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Fix the build. Merge conflict between two PRs (#4936)

This commit is contained in:
Alexander Harkness 2020-09-25 10:59:08 +00:00 committed by GitHub
parent a78fd671b2
commit 281beba50e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Blocks/BlockPackedIce.h
View File

@ -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))