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

Fix door placing in connection with slabs

Browse Source 
Except top-half slabs as transparent blocks for doors.
This commit is contained in:
wraith11 2015-04-07 17:51:38 +02:00 committed by wraith11
parent 13b96a40ea
commit 794013315b
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Blocks/BlockDoor.h
View File

@ -6,7 +6,7 @@
#include "Chunk.h" #include "Chunk.h"
#include "MetaRotator.h" #include "MetaRotator.h"
#include "ChunkInterface.h" #include "ChunkInterface.h"
#include "BlockSlab.h"
@ -109,16 +109,31 @@ public:
virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
{ {
return ((a_RelY > 0) && CanBeOn(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ))); return ((a_RelY > 0) && CanBeOn(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ), a_Chunk.GetMeta(a_RelX, a_RelY - 1, a_RelZ)));
} }
/** Returns true if door can be placed on the specified block type. */ /** Returns true if door can be placed on the specified block type. */
static bool CanBeOn(BLOCKTYPE a_BlockType) static bool CanBeOn(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
{ {
// Vanilla refuses to place doors on transparent blocks // Vanilla refuses to place doors on transparent blocks, except top-half slabs and other doors
// We need to keep the door compatible with itself, otherwise the top half drops while the bottom half stays // We need to keep the door compatible with itself, otherwise the top half drops while the bottom half stays
return !cBlockInfo::IsTransparent(a_BlockType) || IsDoorBlockType(a_BlockType);
// Doors can be placed on upside-down slabs
if (cBlockSlabHandler::IsAnySlabType(a_BlockType) && ((a_BlockMeta & 0x08) != 0))
{
return true;
}
// Doors can also be placed on other doors
else if (IsDoorBlockType(a_BlockType))
{
return true;
}
// Doors can not be placed on transparent blocks, but on any other block
else
{
return !cBlockInfo::IsTransparent(a_BlockType);
}
} }

2
src/Items/ItemDoor.h
View File

@ -40,7 +40,7 @@ public:
} }
// The door needs a compatible block below it: // The door needs a compatible block below it:
if (!cBlockDoorHandler::CanBeOn(a_World.GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ))) if (!cBlockDoorHandler::CanBeOn(a_World.GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ), a_World.GetBlockMeta(a_BlockX, a_BlockY - 1, a_BlockZ)))
{ {
return false; return false;
} }