summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2021-01-18 17:09:10 +0100
committerGitHub <noreply@github.com>2021-01-18 17:09:10 +0100
commit813176fbd1de6591201a840829cb3f4ab927f754 (patch)
tree72329bea9c42ee629737a215d7f4e157896ccd46 /src/Blocks
parentFixed horse UI desync when taking saddle out (#5108) (diff)
downloadcuberite-813176fbd1de6591201a840829cb3f4ab927f754.tar
cuberite-813176fbd1de6591201a840829cb3f4ab927f754.tar.gz
cuberite-813176fbd1de6591201a840829cb3f4ab927f754.tar.bz2
cuberite-813176fbd1de6591201a840829cb3f4ab927f754.tar.lz
cuberite-813176fbd1de6591201a840829cb3f4ab927f754.tar.xz
cuberite-813176fbd1de6591201a840829cb3f4ab927f754.tar.zst
cuberite-813176fbd1de6591201a840829cb3f4ab927f754.zip
Diffstat (limited to 'src/Blocks')
-rw-r--r--src/Blocks/BlockConcretePowder.h2
-rw-r--r--src/Blocks/BlockHandler.cpp2
-rw-r--r--src/Blocks/BlockSponge.h2
-rw-r--r--src/Blocks/BlockVine.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/Blocks/BlockConcretePowder.h b/src/Blocks/BlockConcretePowder.h
index a69001a65..52591b3c1 100644
--- a/src/Blocks/BlockConcretePowder.h
+++ b/src/Blocks/BlockConcretePowder.h
@@ -29,7 +29,7 @@ private:
virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, Vector3i a_BlockPos, eBlockFace a_WhichNeighbor) const override
{
- a_ChunkInterface.DoWithChunkAt(a_BlockPos, [&](cChunk & a_Chunk) { CheckSoaked(a_Chunk.AbsoluteToRelative(a_BlockPos), a_Chunk); return true; });
+ a_ChunkInterface.DoWithChunkAt(a_BlockPos, [&](cChunk & a_Chunk) { CheckSoaked(cChunkDef::AbsoluteToRelative(a_BlockPos), a_Chunk); return true; });
}
/** Check blocks above and around to see if they are water. If one is, converts this into concrete block. */
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index 326f0de27..0e1672ce8 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -488,7 +488,7 @@ void cBlockHandler::OnUpdate(
void cBlockHandler::OnNeighborChanged(cChunkInterface & a_ChunkInterface, Vector3i a_BlockPos, eBlockFace a_WhichNeighbor) const
{
- if (a_ChunkInterface.DoWithChunkAt(a_BlockPos, [&](cChunk & a_Chunk) { return CanBeAt(a_ChunkInterface, a_Chunk.AbsoluteToRelative(a_BlockPos), a_Chunk); }))
+ if (a_ChunkInterface.DoWithChunkAt(a_BlockPos, [&](cChunk & a_Chunk) { return CanBeAt(a_ChunkInterface, cChunkDef::AbsoluteToRelative(a_BlockPos), a_Chunk); }))
{
return;
}
diff --git a/src/Blocks/BlockSponge.h b/src/Blocks/BlockSponge.h
index a089bc0d0..0e4865a8e 100644
--- a/src/Blocks/BlockSponge.h
+++ b/src/Blocks/BlockSponge.h
@@ -29,7 +29,7 @@ private:
virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, Vector3i a_BlockPos, eBlockFace a_WhichNeighbor) const override
{
- a_ChunkInterface.DoWithChunkAt(a_BlockPos, [&](cChunk & a_Chunk) { CheckSoaked(a_Chunk.AbsoluteToRelative(a_BlockPos), a_Chunk); return true; });
+ a_ChunkInterface.DoWithChunkAt(a_BlockPos, [&](cChunk & a_Chunk) { CheckSoaked(cChunkDef::AbsoluteToRelative(a_BlockPos), a_Chunk); return true; });
}
/** Check blocks around the sponge to see if they are water.
diff --git a/src/Blocks/BlockVine.h b/src/Blocks/BlockVine.h
index 9738cd89b..8d42137d4 100644
--- a/src/Blocks/BlockVine.h
+++ b/src/Blocks/BlockVine.h
@@ -162,7 +162,7 @@ private:
a_ChunkInterface.DoWithChunkAt(a_BlockPos, [&](cChunk & a_Chunk)
{
- const auto a_RelPos = a_Chunk.AbsoluteToRelative(a_BlockPos);
+ const auto a_RelPos = cChunkDef::AbsoluteToRelative(a_BlockPos);
NIBBLETYPE CurMeta = a_Chunk.GetMeta(a_RelPos);
NIBBLETYPE MaxMeta = GetMaxMeta(a_Chunk, a_RelPos);