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

Fixed naming and initialization.

Browse Source
This commit is contained in:
madmaxoft 2013-12-17 20:06:48 +01:00
parent a74fdd9023
commit a4f4ba534e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Items/ItemBucket.h
View File

@ -151,6 +151,7 @@ public:
return true; return true;
} }
bool GetBlockFromTrace(cWorld * a_World, cPlayer * a_Player, Vector3i & BlockPos) bool GetBlockFromTrace(cWorld * a_World, cPlayer * a_Player, Vector3i & BlockPos)
{ {
class cCallbacks : class cCallbacks :
@ -158,7 +159,14 @@ public:
{ {
public: public:
Vector3i m_Pos; Vector3i m_Pos;
bool HitFluid; bool m_HasHitFluid;
cCallbacks(void) :
m_HasHitFluid(false)
{
}
virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override 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. if (a_BlockMeta != 0) // Even if it was a water block it would not be a source.
@ -167,8 +175,8 @@ public:
} }
if (IsBlockWater(a_BlockType) || IsBlockLava(a_BlockType)) if (IsBlockWater(a_BlockType) || IsBlockLava(a_BlockType))
{ {
HitFluid = true; m_HasHitFluid = true;
m_Pos = Vector3i(a_BlockX, a_BlockY, a_BlockZ); m_Pos.Set(a_BlockX, a_BlockY, a_BlockZ);
return true; return true;
} }
return false; return false;
@ -181,7 +189,7 @@ public:
Tracer.Trace(Start.x, Start.y, Start.z, End.x, End.y, End.z); Tracer.Trace(Start.x, Start.y, Start.z, End.x, End.y, End.z);
if (!Callbacks.HitFluid) if (!Callbacks.m_HasHitFluid)
{ {
return false; return false;
} }