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

Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframes

Browse Source
This commit is contained in:
Tiger Wang 2014-02-18 11:44:19 +00:00
commit 9c409fc65c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Items/ItemItemFrame.h
View File

@ -23,23 +23,26 @@ public:
{ {
if (a_Dir == BLOCK_FACE_NONE) if (a_Dir == BLOCK_FACE_NONE)
{ {
// Client sends this if clicked on top or bottom face
return false; return false;
} }
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir); AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir); // Make sure block that will be occupied is free
BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ); BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir, true); AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir, true); // We want the clicked block, so go back again
if (Block == E_BLOCK_AIR) if (Block == E_BLOCK_AIR)
{ {
int Dir = 0; int Dir = 0;
// The client uses different values for painting directions and block faces. Our constants are for the block faces, so we convert them here to painting faces
switch (a_Dir) switch (a_Dir)
{ {
case BLOCK_FACE_SOUTH: break; case BLOCK_FACE_ZP: break; // Initialised to zero
case BLOCK_FACE_NORTH: Dir = 2; break; case BLOCK_FACE_ZM: Dir = 2; break;
case BLOCK_FACE_WEST: Dir = 1; break; case BLOCK_FACE_XM: Dir = 1; break;
case BLOCK_FACE_EAST: Dir = 3; break; case BLOCK_FACE_XP: Dir = 3; break;
default: return false; default: ASSERT(!"Unhandled block face when trying spawn item frame!"); return false;
} }
cItemFrame * ItemFrame = new cItemFrame(Dir, a_BlockX, a_BlockY, a_BlockZ); cItemFrame * ItemFrame = new cItemFrame(Dir, a_BlockX, a_BlockY, a_BlockZ);