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

Fix certain item drops (#4536) 

* Fix certain item drops

* Revert unwanted changes

* Revert unwanted changes

* Revert change

* Style fixes
This commit is contained in:
Mat 2020-03-23 22:07:08 +02:00 committed by GitHub
parent bff7319622
commit 0d0d019bbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 51 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Blocks/BlockCauldron.h
View File

@ -8,9 +8,9 @@
class cBlockCauldronHandler :
public cClearMetaOnDrop<cBlockHandler>
public cBlockHandler
{
using super = cClearMetaOnDrop<cBlockHandler>;
using super = cBlockHandler;
public:
@ -19,6 +19,11 @@ public:
{
}
virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override
{
return cItem(E_ITEM_CAULDRON, 1, 0);
}
virtual bool OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override
{
NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta({a_BlockX, a_BlockY, a_BlockZ});

9
src/Blocks/BlockComparator.h
View File

@ -10,9 +10,9 @@
class cBlockComparatorHandler :
public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>>
public cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>
{
using super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>>;
using super = cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>;
public:
@ -45,6 +45,11 @@ public:
return ((a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) != E_BLOCK_AIR));
}
virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override
{
return cItem(E_ITEM_COMPARATOR, 1, 0);
}
virtual bool GetPlacementBlockTypeMeta(
cChunkInterface & a_ChunkInterface, cPlayer & a_Player,
int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,

13
src/Blocks/BlockFarmland.h
View File

@ -17,9 +17,9 @@
class cBlockFarmlandHandler :
public cClearMetaOnDrop<cBlockHandler>
public cBlockHandler
{
using super = cClearMetaOnDrop<cBlockHandler>;
using super = cBlockHandler;
public:
@ -32,6 +32,15 @@ public:
virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override
{
return cItem(E_BLOCK_DIRT, 1, 0);
}
virtual void OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
{
NIBBLETYPE BlockMeta = a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ);

13
src/Blocks/BlockFlowerPot.h
View File

@ -8,9 +8,9 @@
class cBlockFlowerPotHandler :
public cClearMetaOnDrop<cBlockEntityHandler>
public cBlockEntityHandler
{
using super = cClearMetaOnDrop<cBlockEntityHandler>;
using super = cBlockEntityHandler;
public:
@ -23,6 +23,15 @@ public:
virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override
{
return cItem(E_ITEM_FLOWER_POT, 1, 0);
}
virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override
{
UNUSED(a_Meta);

9
src/Blocks/BlockRedstone.h
View File

@ -9,9 +9,9 @@
class cBlockRedstoneHandler :
public cClearMetaOnDrop<cBlockHandler>
public cBlockHandler
{
using super = cClearMetaOnDrop<cBlockHandler>;
using super = cBlockHandler;
public:
@ -46,6 +46,11 @@ public:
return false;
}
virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override
{
return cItem(E_ITEM_REDSTONE_DUST, 1, 0);
}
virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override
{
UNUSED(a_Meta);

10
src/Blocks/BlockRedstoneRepeater.h
View File

@ -12,9 +12,9 @@
class cBlockRedstoneRepeaterHandler:
public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>>
public cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>
{
using super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>>;
using super = cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>;
public:
@ -32,6 +32,7 @@ public:
{
a_BlockType = m_BlockType;
a_BlockMeta = RepeaterRotationToMetaData(a_Player.GetYaw());
return true;
}
@ -78,6 +79,11 @@ public:
return false;
}
virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override
{
return cItem(E_ITEM_REDSTONE_REPEATER, 1, 0);
}
inline static NIBBLETYPE RepeaterRotationToMetaData(double a_Rotation)
{
a_Rotation += 90 + 45; // So its not aligned with axis