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

Check block type from cBlockEntity

Browse Source
This commit is contained in:
Howaner 2014-06-17 14:45:29 +02:00
parent 7e985f3c7d
commit 8e927e6e2b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Blocks/BlockMobHead.h
View File

@ -34,11 +34,11 @@ public:
{ {
virtual bool Item(cBlockEntity * a_BlockEntity) virtual bool Item(cBlockEntity * a_BlockEntity)
{ {
cMobHeadEntity * MobHeadEntity = static_cast<cMobHeadEntity*>(a_BlockEntity); if (a_BlockEntity->GetBlockType() != E_BLOCK_HEAD)
if (MobHeadEntity == NULL)
{ {
return false; return false;
} }
cMobHeadEntity * MobHeadEntity = static_cast<cMobHeadEntity*>(a_BlockEntity);
cItems Pickups; cItems Pickups;
Pickups.Add(E_ITEM_HEAD, 1, (short) MobHeadEntity->GetType()); Pickups.Add(E_ITEM_HEAD, 1, (short) MobHeadEntity->GetType());
@ -73,13 +73,13 @@ public:
{ {
bool m_IsWither; bool m_IsWither;
virtual bool Item (cBlockEntity * a_BlockEntity) virtual bool Item(cBlockEntity * a_BlockEntity)
{ {
cMobHeadEntity * MobHeadEntity = static_cast<cMobHeadEntity*>(a_BlockEntity); if (a_BlockEntity->GetBlockType() != E_BLOCK_HEAD)
if (MobHeadEntity == NULL)
{ {
return false; return false;
} }
cMobHeadEntity * MobHeadEntity = static_cast<cMobHeadEntity*>(a_BlockEntity);
m_IsWither = (MobHeadEntity->GetType() == SKULL_TYPE_WITHER); m_IsWither = (MobHeadEntity->GetType() == SKULL_TYPE_WITHER);
return false; return false;
@ -205,13 +205,13 @@ public:
NIBBLETYPE m_OldBlockMeta; NIBBLETYPE m_OldBlockMeta;
NIBBLETYPE m_NewBlockMeta; NIBBLETYPE m_NewBlockMeta;
virtual bool Item (cBlockEntity * a_BlockEntity) virtual bool Item(cBlockEntity * a_BlockEntity)
{ {
cMobHeadEntity * MobHeadEntity = static_cast<cMobHeadEntity*>(a_BlockEntity); if (a_BlockEntity->GetBlockType() != E_BLOCK_HEAD)
if (MobHeadEntity == NULL)
{ {
return false; return false;
} }
cMobHeadEntity * MobHeadEntity = static_cast<cMobHeadEntity*>(a_BlockEntity);
int Rotation = 0; int Rotation = 0;
if (m_NewBlockMeta == 1) if (m_NewBlockMeta == 1)