diff options
| author | mBornand <63592189+mBornand@users.noreply.github.com> | 2020-05-08 11:04:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 11:04:07 +0200 |
| commit | 1565d9b3ce8e74cdf8d2c95181f98531794f2c36 (patch) | |
| tree | 09f6d9158cd2c583789d5c23bc174be115178972 /src/Items/ItemLilypad.h | |
| parent | Fix SetBlockMeta call in observer handler (#4728) (diff) | |
| download | cuberite-1565d9b3ce8e74cdf8d2c95181f98531794f2c36.tar cuberite-1565d9b3ce8e74cdf8d2c95181f98531794f2c36.tar.gz cuberite-1565d9b3ce8e74cdf8d2c95181f98531794f2c36.tar.bz2 cuberite-1565d9b3ce8e74cdf8d2c95181f98531794f2c36.tar.lz cuberite-1565d9b3ce8e74cdf8d2c95181f98531794f2c36.tar.xz cuberite-1565d9b3ce8e74cdf8d2c95181f98531794f2c36.tar.zst cuberite-1565d9b3ce8e74cdf8d2c95181f98531794f2c36.zip | |
Diffstat (limited to 'src/Items/ItemLilypad.h')
| -rw-r--r-- | src/Items/ItemLilypad.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Items/ItemLilypad.h b/src/Items/ItemLilypad.h index 1190e817b..747175811 100644 --- a/src/Items/ItemLilypad.h +++ b/src/Items/ItemLilypad.h @@ -66,7 +66,7 @@ public: { } - virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, eBlockFace a_CBEntryFace) override + virtual bool OnNextBlock(Vector3i a_CBBlockPos, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, eBlockFace a_CBEntryFace) override { if (IsBlockWater(a_CBBlockType)) { @@ -74,7 +74,7 @@ public: { return false; } - AddFaceDirection(a_CBBlockX, a_CBBlockY, a_CBBlockZ, BLOCK_FACE_YP); // Always place pad at top of water block + a_CBBlockPos = AddFaceDirection(a_CBBlockPos, BLOCK_FACE_YP); // Always place pad at top of water block if ( !IsBlockWater(a_CBBlockType) && cBlockInfo::FullyOccupiesVoxel(a_CBBlockType) @@ -84,7 +84,7 @@ public: return true; } m_HasHitFluid = true; - m_Pos.Set(a_CBBlockX, a_CBBlockY, a_CBBlockZ); + m_Pos = a_CBBlockPos; return true; } return false; @@ -96,7 +96,7 @@ public: } Callbacks; auto Start = a_Player->GetEyePosition() + a_Player->GetLookVector(); auto End = a_Player->GetEyePosition() + a_Player->GetLookVector() * 5; - cLineBlockTracer::Trace(*a_Player->GetWorld(), Callbacks, Start.x, Start.y, Start.z, End.x, End.y, End.z); + cLineBlockTracer::Trace(*a_Player->GetWorld(), Callbacks, Start, End); if (Callbacks.m_HasHitFluid) { |