summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-02-18 21:40:02 +0100
committerHowaner <franzi.moos@googlemail.com>2014-02-18 21:40:02 +0100
commit52c41f886927cf62ed592ba7fec974eee6b16844 (patch)
treea8479e65d606e2bcdf092501f30a43b778917d13 /src/BlockEntities
parentAdd Skulls/Heads (diff)
downloadcuberite-52c41f886927cf62ed592ba7fec974eee6b16844.tar
cuberite-52c41f886927cf62ed592ba7fec974eee6b16844.tar.gz
cuberite-52c41f886927cf62ed592ba7fec974eee6b16844.tar.bz2
cuberite-52c41f886927cf62ed592ba7fec974eee6b16844.tar.lz
cuberite-52c41f886927cf62ed592ba7fec974eee6b16844.tar.xz
cuberite-52c41f886927cf62ed592ba7fec974eee6b16844.tar.zst
cuberite-52c41f886927cf62ed592ba7fec974eee6b16844.zip
Diffstat (limited to '')
-rw-r--r--src/BlockEntities/BlockEntity.cpp2
-rw-r--r--src/BlockEntities/SkullEntity.cpp4
-rw-r--r--src/BlockEntities/SkullEntity.h2
3 files changed, 3 insertions, 5 deletions
diff --git a/src/BlockEntities/BlockEntity.cpp b/src/BlockEntities/BlockEntity.cpp
index 441f54a26..f01a139d2 100644
--- a/src/BlockEntities/BlockEntity.cpp
+++ b/src/BlockEntities/BlockEntity.cpp
@@ -30,9 +30,9 @@ cBlockEntity * cBlockEntity::CreateByBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE
case E_BLOCK_DISPENSER: return new cDispenserEntity (a_BlockX, a_BlockY, a_BlockZ, a_World);
case E_BLOCK_DROPPER: return new cDropperEntity (a_BlockX, a_BlockY, a_BlockZ, a_World);
case E_BLOCK_ENDER_CHEST: return new cEnderChestEntity (a_BlockX, a_BlockY, a_BlockZ, a_World);
+ case E_BLOCK_HEAD: return new cSkullEntity (a_BlockX, a_BlockY, a_BlockZ, a_World);
case E_BLOCK_LIT_FURNACE: return new cFurnaceEntity (a_BlockX, a_BlockY, a_BlockZ, a_BlockType, a_BlockMeta, a_World);
case E_BLOCK_FURNACE: return new cFurnaceEntity (a_BlockX, a_BlockY, a_BlockZ, a_BlockType, a_BlockMeta, a_World);
- case E_BLOCK_HEAD: return new cSkullEntity (a_BlockX, a_BlockY, a_BlockZ, a_BlockMeta, a_World);
case E_BLOCK_HOPPER: return new cHopperEntity (a_BlockX, a_BlockY, a_BlockZ, a_World);
case E_BLOCK_SIGN_POST: return new cSignEntity (a_BlockType, a_BlockX, a_BlockY, a_BlockZ, a_World);
case E_BLOCK_WALLSIGN: return new cSignEntity (a_BlockType, a_BlockX, a_BlockY, a_BlockZ, a_World);
diff --git a/src/BlockEntities/SkullEntity.cpp b/src/BlockEntities/SkullEntity.cpp
index 3f3bc00ed..43b97b93e 100644
--- a/src/BlockEntities/SkullEntity.cpp
+++ b/src/BlockEntities/SkullEntity.cpp
@@ -12,12 +12,10 @@
-cSkullEntity::cSkullEntity(int a_BlockX, int a_BlockY, int a_BlockZ, NIBBLETYPE a_BlockMeta, cWorld * a_World) :
+cSkullEntity::cSkullEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
super(E_BLOCK_HEAD, a_BlockX, a_BlockY, a_BlockZ, a_World),
- //m_SkullType(static_cast<eSkullType>(a_BlockMeta)),
m_Owner("")
{
-
}
diff --git a/src/BlockEntities/SkullEntity.h b/src/BlockEntities/SkullEntity.h
index 6f47c7d30..ffd84465f 100644
--- a/src/BlockEntities/SkullEntity.h
+++ b/src/BlockEntities/SkullEntity.h
@@ -35,7 +35,7 @@ public:
// tolua_end
/// Creates a new skull entity at the specified block coords. a_World may be NULL
- cSkullEntity(int a_BlockX, int a_BlockY, int a_BlockZ, NIBBLETYPE a_BlockMeta, cWorld * a_World);
+ cSkullEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
bool LoadFromJson( const Json::Value& a_Value );
virtual void SaveToJson(Json::Value& a_Value ) override;