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

Trapdoor crash fix (#4890)

Browse Source 
* [WIP] Trapdoor crash fix

* Fixed code style

* Updated commentary in the code

* Updated commentary in the code again

* Fix copy-past error

* Fix another copy-past error!

* Fixed orientation & clipping

* Remove redundant clause

* Some code cleanup

* Fixed compilation error

* Moved logic into helper function, slightly reorganised the caller

* Fixed comments

* Fixed comments, what an idiot

* Added to CONTRIBUTORS

* Fixed bitwise error

* Use cYawRotator

* Reduce indent

Co-authored-by: Elias Thomson <fiv.pids@gmail.com>
Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
This commit is contained in:
theophriene 2020-09-21 14:41:31 +00:00 committed by GitHub
parent 8de71fc9d6
commit 0a1bf06c6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -65,6 +65,7 @@ sweetgiorni
Sxw1212
Taugeshtu
tigerw (Tiger Wang)
theophriene
tonibm19
TooAngel
UltraCoderRU

34
src/Blocks/BlockTrapdoor.h
View File

@ -9,9 +9,9 @@
class cBlockTrapdoorHandler :
public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x01, 0x02, 0x00, 0x03, false>>
public cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x01, 0x02, 0x00, 0x03, false>>
{
using Super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x01, 0x02, 0x00, 0x03, false>>;
using Super = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x01, 0x02, 0x00, 0x03, false>>;
public:
@ -80,13 +80,38 @@ private:
BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
) const override
{
if (a_ClickedBlockFace == BLOCK_FACE_YP)
{
// Trapdoor is placed on top of a block.
// Engage yaw rotation to determine hinge direction:
return Super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_PlacedBlockPos, a_ClickedBlockFace, a_CursorPos, a_BlockType, a_BlockMeta);
}
else if (a_ClickedBlockFace == BLOCK_FACE_YM)
{
// Trapdoor is placed on bottom of a block.
// Engage yaw rotation to determine hinge direction:
if (!Super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_PlacedBlockPos, a_ClickedBlockFace, a_CursorPos, a_BlockType, a_BlockMeta))
{
return false;
}
// Toggle 'Move up half-block' bit on:
a_BlockMeta |= 0x8;
return true;
}
// Placement on block sides; hinge direction is determined by which side was clicked:
a_BlockType = m_BlockType;
a_BlockMeta = BlockFaceToMetaData(a_ClickedBlockFace);
if (a_CursorPos.y > 7)
{
// Trapdoor is placed on a higher half of a vertical block.
// Toggle 'Move up half-block' bit on:
a_BlockMeta |= 0x8;
}
return true;
}
@ -102,15 +127,12 @@ private:
case BLOCK_FACE_ZM: return 0x0;
case BLOCK_FACE_XP: return 0x3;
case BLOCK_FACE_XM: return 0x2;
case BLOCK_FACE_NONE:
case BLOCK_FACE_YM:
case BLOCK_FACE_YP:
default:
{
ASSERT(!"Unhandled block face!");
return 0;
}
}
UNREACHABLE("Unsupported block face");
}