|
@@ -62,7 +62,7 @@ void BlockType::createSuperBlock( Block* zBlock, Item* zItem ) const
|
|
|
zBlock->maxHP = item->maxHP;
|
|
|
zBlock->hardness = item->hardness;
|
|
|
zBlock->speedModifier = item->speedModifier;
|
|
|
- zBlock->zTool = StaticRegistry<ItemType>::INSTANCE.zElement( item->toolId );
|
|
|
+ zBlock->zTool = item->toolId >= 0 ? StaticRegistry<ItemType>::INSTANCE.zElement( item->toolId ) : 0;
|
|
|
}
|
|
|
|
|
|
void BlockType::createSuperItem( Block* zBlock, Item* zItem ) const
|
|
@@ -78,7 +78,7 @@ void BlockType::createSuperItem( Block* zBlock, Item* zItem ) const
|
|
|
item->maxHP = zBlock->maxHP;
|
|
|
item->hardness = zBlock->hardness;
|
|
|
item->speedModifier = zBlock->speedModifier;
|
|
|
- item->toolId = zBlock->zTool->getId();
|
|
|
+ item->toolId = zBlock->zTool ? zBlock->zTool->getId() : -1;
|
|
|
}
|
|
|
|
|
|
Block* BlockType::loadBlock( Framework::Vec3<int> position, Framework::StreamReader* zReader ) const
|