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

Using Recommendations.

This commit is contained in:
STRWarrior 2013-12-17 19:42:06 +01:00
parent d28142ff71
commit f1a1d6fa5c
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Items/ItemBucket.h
View File

@ -46,7 +46,10 @@ public:
}
Vector3i BlockPos;
GetBlockFromTrace(a_World, a_Player, BlockPos);
if (!GetBlockFromTrace(a_World, a_Player, BlockPos))
{
return false; // Nothing in range.
}
if (a_World->GetBlockMeta(BlockPos.x, BlockPos.y, BlockPos.z) != 0)
{
@ -70,16 +73,18 @@ public:
return false;
}
// Remove the bucket from the inventory
if (!a_Player->GetInventory().RemoveOneEquippedItem())
// Give new bucket, filled with fluid when the gamemode is not creative:
if (!a_Player->IsGameModeCreative())
{
LOG("Clicked with an empty bucket, but cannot remove one from the inventory? WTF?");
ASSERT(!"Inventory bucket mismatch");
return true;
// Remove the bucket from the inventory
if (!a_Player->GetInventory().RemoveOneEquippedItem())
{
LOG("Clicked with an empty bucket, but cannot remove one from the inventory? WTF?");
ASSERT(!"Inventory bucket mismatch");
return true;
}
a_Player->GetInventory().AddItem(cItem(NewItem), true, true);
}
// Give new bucket, filled with fluid:
a_Player->GetInventory().AddItem(cItem(NewItem), true, true);
// Remove water / lava block
a_Player->GetWorld()->SetBlock(BlockPos.x, BlockPos.y, BlockPos.z, E_BLOCK_AIR, 0);
@ -153,14 +158,16 @@ public:
{
public:
Vector3d Pos;
bool HitFluid;
virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override
{
if (a_BlockMeta != 0) // Even if it was a water block it would not be a source.
{
return false;
}
if ((IsBlockWater(a_BlockType)) || (IsBlockLava(a_BlockType)))
if (IsBlockWater(a_BlockType) || IsBlockLava(a_BlockType))
{
HitFluid = true;
Pos = Vector3d(a_BlockX, a_BlockY, a_BlockZ);
return true;
}
@ -174,6 +181,12 @@ public:
Tracer.Trace(Start.x, Start.y, Start.z, End.x, End.y, End.z);
if (!Callbacks.HitFluid)
{
return false;
}
BlockPos.Set((int) Callbacks.Pos.x, (int) Callbacks.Pos.y, (int) Callbacks.Pos.z);
return true;
}