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

Refactored block-to-pickup conversion. (#4417)

Browse Source
This commit is contained in:
Mattes D
2019-10-16 10:06:34 +02:00
committed by GitHub
parent 241d97bbf9
commit 221cc4ec5c
121 changed files with 2496 additions and 1744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Blocks/BlockDoor.cpp
View File

@@ -7,8 +7,8 @@
cBlockDoorHandler::cBlockDoorHandler(BLOCKTYPE a_BlockType)
: super(a_BlockType)
cBlockDoorHandler::cBlockDoorHandler(BLOCKTYPE a_BlockType):
super(a_BlockType)
{
}
@@ -16,24 +16,22 @@ cBlockDoorHandler::cBlockDoorHandler(BLOCKTYPE a_BlockType)
void cBlockDoorHandler::OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ)
void cBlockDoorHandler::OnBroken(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, Vector3i a_BlockPos, BLOCKTYPE a_OldBlockType, NIBBLETYPE a_OldBlockMeta)
{
NIBBLETYPE OldMeta = a_ChunkInterface.GetBlockMeta({a_BlockX, a_BlockY, a_BlockZ});
if (OldMeta & 8)
if ((a_OldBlockMeta & 0x08) != 0)
{
// Was upper part of door
if (IsDoorBlockType(a_ChunkInterface.GetBlock({a_BlockX, a_BlockY - 1, a_BlockZ})))
if ((a_BlockPos.y > 0) && IsDoorBlockType(a_ChunkInterface.GetBlock(a_BlockPos.addedY(-1))))
{
a_ChunkInterface.FastSetBlock(a_BlockX, a_BlockY - 1, a_BlockZ, E_BLOCK_AIR, 0);
a_ChunkInterface.DropBlockAsPickups(a_BlockPos.addedY(-1));
}
}
else
{
// Was lower part
if (IsDoorBlockType(a_ChunkInterface.GetBlock({a_BlockX, a_BlockY + 1, a_BlockZ})))
if ((a_BlockPos.y < cChunkDef::Height - 1) && IsDoorBlockType(a_ChunkInterface.GetBlock(a_BlockPos.addedY(1))))
{
a_ChunkInterface.FastSetBlock(a_BlockX, a_BlockY + 1, a_BlockZ, E_BLOCK_AIR, 0);
a_ChunkInterface.DropBlockAsPickups(a_BlockPos.addedY(1));
}
}
}