summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockDropSpenser.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2020-09-23 17:06:27 +0200
committerAlexander Harkness <me@bearbin.net>2020-09-25 11:07:01 +0200
commitc53a0ba5f6f71da384a45a07685f8e25c3f91a29 (patch)
treebc8d016d1f5c5b5206b3b4f5580295bd91bb6099 /src/Blocks/BlockDropSpenser.h
parentSmall cleanup in Jukeboxes (diff)
downloadcuberite-c53a0ba5f6f71da384a45a07685f8e25c3f91a29.tar
cuberite-c53a0ba5f6f71da384a45a07685f8e25c3f91a29.tar.gz
cuberite-c53a0ba5f6f71da384a45a07685f8e25c3f91a29.tar.bz2
cuberite-c53a0ba5f6f71da384a45a07685f8e25c3f91a29.tar.lz
cuberite-c53a0ba5f6f71da384a45a07685f8e25c3f91a29.tar.xz
cuberite-c53a0ba5f6f71da384a45a07685f8e25c3f91a29.tar.zst
cuberite-c53a0ba5f6f71da384a45a07685f8e25c3f91a29.zip
Diffstat (limited to 'src/Blocks/BlockDropSpenser.h')
-rw-r--r--src/Blocks/BlockDropSpenser.h25
1 files changed, 2 insertions, 23 deletions
diff --git a/src/Blocks/BlockDropSpenser.h b/src/Blocks/BlockDropSpenser.h
index fa591bf93..793cc0be9 100644
--- a/src/Blocks/BlockDropSpenser.h
+++ b/src/Blocks/BlockDropSpenser.h
@@ -5,8 +5,6 @@
#pragma once
-#include "../Blocks/BlockPiston.h"
-#include "../BlockEntities/DropSpenserEntity.h"
#include "Mixins.h"
@@ -14,9 +12,9 @@
class cBlockDropSpenserHandler :
- public cPitchYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>
+ public cPitchYawRotator<cClearMetaOnDrop<cBlockEntityHandler>, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>
{
- using Super = cPitchYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>;
+ using Super = cPitchYawRotator<cClearMetaOnDrop<cBlockEntityHandler>, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>;
public:
@@ -24,28 +22,9 @@ public:
private:
- virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) const override
- {
- cItems res(cItem(m_BlockType, 1));
- if (a_BlockEntity != nullptr)
- {
- auto be = static_cast<cDropSpenserEntity *>(a_BlockEntity);
- res.AddItemGrid(be->GetContents());
- }
- return res;
- }
-
-
-
-
-
virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) const override
{
UNUSED(a_Meta);
return 11;
}
} ;
-
-
-
-