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

Rail: avoid invalid game states (#4864)

Browse Source 
+ Check CanBeAt
Ref: #4859

Co-authored-by: Alexander Harkness <me@bearbin.net>
This commit is contained in:
Tiger Wang 2020-09-13 14:44:20 +01:00 committed by GitHub
parent 33f3c18bc1
commit d9d71e1de6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Blocks/BlockRail.h
View File

@ -104,12 +104,14 @@ public:
virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, Vector3i a_BlockPos, eBlockFace a_WhichNeighbor) override virtual void OnNeighborChanged(cChunkInterface & a_ChunkInterface, Vector3i a_BlockPos, eBlockFace a_WhichNeighbor) override
{ {
auto meta = a_ChunkInterface.GetBlockMeta(a_BlockPos); const auto Meta = a_ChunkInterface.GetBlockMeta(a_BlockPos);
auto newMeta = FindMeta(a_ChunkInterface, a_BlockPos); const auto NewMeta = FindMeta(a_ChunkInterface, a_BlockPos);
if (IsUnstable(a_ChunkInterface, a_BlockPos) && (meta != newMeta)) if ((Meta != NewMeta) && IsUnstable(a_ChunkInterface, a_BlockPos))
{ {
a_ChunkInterface.FastSetBlock(a_BlockPos, m_BlockType, (m_BlockType == E_BLOCK_RAIL) ? newMeta : newMeta | (meta & 0x08)); a_ChunkInterface.FastSetBlock(a_BlockPos, m_BlockType, (m_BlockType == E_BLOCK_RAIL) ? NewMeta : NewMeta | (Meta & 0x08));
} }
Super::OnNeighborChanged(a_ChunkInterface, a_BlockPos, a_WhichNeighbor);
} }
@ -285,11 +287,13 @@ public:
return Meta; return Meta;
} }
inline bool CanThisRailCurve(void) inline bool CanThisRailCurve(void)
{ {
return m_BlockType == E_BLOCK_RAIL; return m_BlockType == E_BLOCK_RAIL;
} }
bool IsUnstable(cChunkInterface & a_ChunkInterface, Vector3i a_Pos) bool IsUnstable(cChunkInterface & a_ChunkInterface, Vector3i a_Pos)
{ {
if (!IsBlockRail(a_ChunkInterface.GetBlock(a_Pos))) if (!IsBlockRail(a_ChunkInterface.GetBlock(a_Pos)))
@ -422,6 +426,7 @@ public:
return false; return false;
} }
bool IsNotConnected(cChunkInterface & a_ChunkInterface, Vector3i a_Pos, eBlockFace a_BlockFace, char a_Pure = 0) bool IsNotConnected(cChunkInterface & a_ChunkInterface, Vector3i a_Pos, eBlockFace a_BlockFace, char a_Pure = 0)
{ {
AddFaceDirection(a_Pos.x, a_Pos.y, a_Pos.z, a_BlockFace, false); AddFaceDirection(a_Pos.x, a_Pos.y, a_Pos.z, a_BlockFace, false);
@ -519,6 +524,7 @@ public:
return true; return true;
} }
virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) override virtual NIBBLETYPE MetaRotateCCW(NIBBLETYPE a_Meta) override
{ {
// Bit 0x08 is a flag when a_Meta is in the range 0x00--0x05 and 0x0A--0x0F. // Bit 0x08 is a flag when a_Meta is in the range 0x00--0x05 and 0x0A--0x0F.
@ -556,7 +562,6 @@ public:
} }
virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) override virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) override
{ {
// Bit 0x08 is a flag for value in the range 0x00--0x05 and specifies direction for values withint 0x006--0x09. // Bit 0x08 is a flag for value in the range 0x00--0x05 and specifies direction for values withint 0x006--0x09.
@ -593,7 +598,6 @@ public:
} }
virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta) override virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta) override
{ {
// MirrorXY basically flips the ZP and ZM parts of the meta // MirrorXY basically flips the ZP and ZM parts of the meta
@ -633,7 +637,6 @@ public:
} }
virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta) override virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta) override
{ {
// MirrorYZ basically flips the XP and XM parts of the meta // MirrorYZ basically flips the XP and XM parts of the meta
@ -673,14 +676,9 @@ public:
} }
virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override
{ {
UNUSED(a_Meta); UNUSED(a_Meta);
return 0; return 0;
} }
} ; } ;