summaryrefslogtreecommitdiffstats
path: root/src/Items/ItemLilypad.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-05-06 21:44:55 +0200
committerMattes D <github@xoft.cz>2014-05-06 21:44:55 +0200
commite400b1acd8b0c1457f33bc1730996a3530fa0a4f (patch)
treecd26c0d2b87b62882bcc7b64503de408dd391e6f /src/Items/ItemLilypad.h
parentChanged cPieceGenerator to support pairings. (diff)
parentMerge branch 'master' into fixes (diff)
downloadcuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.tar
cuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.tar.gz
cuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.tar.bz2
cuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.tar.lz
cuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.tar.xz
cuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.tar.zst
cuberite-e400b1acd8b0c1457f33bc1730996a3530fa0a4f.zip
Diffstat (limited to 'src/Items/ItemLilypad.h')
-rw-r--r--src/Items/ItemLilypad.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/Items/ItemLilypad.h b/src/Items/ItemLilypad.h
index 8fc1d8543..bc650cdbd 100644
--- a/src/Items/ItemLilypad.h
+++ b/src/Items/ItemLilypad.h
@@ -47,9 +47,9 @@ public:
public cBlockTracer::cCallbacks
{
public:
- cCallbacks(cWorld * a_CBWorld) :
- m_HasHitFluid(false),
- m_World(a_CBWorld)
+
+ cCallbacks(void) :
+ m_HasHitFluid(false)
{
}
@@ -62,10 +62,9 @@ public:
return false;
}
AddFaceDirection(a_CBBlockX, a_CBBlockY, a_CBBlockZ, BLOCK_FACE_YP); // Always place pad at top of water block
- BLOCKTYPE Block = m_World->GetBlock(a_CBBlockX, a_CBBlockY, a_CBBlockZ);
if (
- !IsBlockWater(Block) &&
- cBlockInfo::FullyOccupiesVoxel(Block)
+ !IsBlockWater(a_CBBlockType) &&
+ cBlockInfo::FullyOccupiesVoxel(a_CBBlockType)
)
{
// Can't place lilypad on air/in another block!
@@ -80,11 +79,10 @@ public:
Vector3i m_Pos;
bool m_HasHitFluid;
- cWorld * m_World;
};
- cCallbacks Callbacks(a_World);
+ cCallbacks Callbacks;
cLineBlockTracer Tracer(*a_Player->GetWorld(), Callbacks);
Vector3d Start(a_Player->GetEyePosition() + a_Player->GetLookVector());
Vector3d End(a_Player->GetEyePosition() + a_Player->GetLookVector() * 5);