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

Fix shears (and vines)

Browse Source 
* Shears now lose durability when breaking any block
* Leaves don't drop 2 leaves anymore when broken by shears
* Removed the chance to drop saplings or apples when leaves are broken by shears
* Vines can't be attached to ender chests, pistons and redstone repeaters
This commit is contained in:
Bond-009 2017-06-20 16:42:14 +02:00 committed by Lukas Pioch
parent 99b4c2bd09
commit 0e1649a0f1
2 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Blocks/BlockVine.h
View File

@ -73,9 +73,15 @@ public:
{
switch (a_BlockType)
{
case E_BLOCK_GLASS:
case E_BLOCK_STAINED_GLASS:
case E_BLOCK_CHEST:
case E_BLOCK_ENDER_CHEST:
case E_BLOCK_GLASS:
case E_BLOCK_PISTON:
case E_BLOCK_PISTON_EXTENSION:
case E_BLOCK_REDSTONE_REPEATER_OFF:
case E_BLOCK_REDSTONE_REPEATER_ON:
case E_BLOCK_STAINED_GLASS:
case E_BLOCK_STICKY_PISTON:
case E_BLOCK_TRAPPED_CHEST:
{
// You can't attach a vine to this solid blocks.

31
src/Items/ItemShears.h
View File

@ -35,15 +35,10 @@ public:
if ((Block == E_BLOCK_LEAVES) || (Block == E_BLOCK_NEW_LEAVES))
{
cItems Drops;
cBlockHandler * Handler = cBlockInfo::GetHandler(Block);
Handler->ConvertToPickups(Drops, BlockMeta);
Drops.Add(Block, 1, BlockMeta & 3);
a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ);
a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ);
a_Player->UseEquippedItem();
return true;
}
@ -68,7 +63,7 @@ public:
virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override
{
return 0;
return 1;
}
@ -79,17 +74,6 @@ public:
a_World->GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, Block, BlockMeta);
super::OnBlockDestroyed(a_World, a_Player, a_Item, a_BlockX, a_BlockY, a_BlockZ);
switch (Block)
{
case E_BLOCK_COBWEB:
case E_BLOCK_DEAD_BUSH:
case E_BLOCK_TRIPWIRE:
case E_BLOCK_VINES:
case E_BLOCK_WOOL:
{
a_Player->UseEquippedItem();
}
}
}
@ -100,16 +84,13 @@ public:
{
return 15.0f;
}
else if (IsBlocksWool(a_Block))
{
return 5.0f;
}
else
{
if (IsBlocksWool(a_Block))
{
return 5.0f;
}
else
{
return super::GetBlockBreakingStrength(a_Block);
}
return super::GetBlockBreakingStrength(a_Block);
}
}