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

Merge pull request #1480 from w00tc0d3/work

Browse Source 
BlockStone: drop the right cobblestone on onBreak().
This commit is contained in:
Alexander Harkness 2014-09-29 19:38:15 +01:00
commit 9083689040
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BlockID.h
View File

@ -652,6 +652,12 @@ enum
E_META_STAINED_GLASS_PANE_RED = 14,
E_META_STAINED_GLASS_PANE_BLACK = 15,
// E_BLOCK_STONE metas:
E_META_STONE = 0,
E_META_STONE_GRANITE = 1,
E_META_STONE_DIORITE = 3,
E_META_STONE_ANDESITE = 5,
// E_BLOCK_STONE_SLAB metas:
E_META_STONE_SLAB_STONE = 0,
E_META_STONE_SLAB_SANDSTONE = 1,

11
src/Blocks/BlockStone.h
View File

@ -2,7 +2,7 @@
#pragma once
#include "BlockHandler.h"
#include "BlockID.h"
@ -18,9 +18,14 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_BLOCK_COBBLESTONE, 1, 0));
if(a_BlockMeta == E_META_STONE)
{
a_Pickups.push_back(cItem(E_BLOCK_COBBLESTONE, 1, 0));
return;
}
a_Pickups.push_back(cItem(E_BLOCK_STONE, 1, a_BlockMeta));
}
} ;
};