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

Merge branch 'master' into Fixes

Browse Source
This commit is contained in:
Howaner
2014-09-25 19:22:46 +02:00
parent 060ac500fc c6f78d516b
commit dd423a2467
4 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Entities/HangingEntity.cpp
View File

@@ -43,11 +43,17 @@ void cHangingEntity::SpawnOn(cClientHandle & a_ClientHandle)
// The client uses different values for item frame directions and block faces. Our constants are for the block faces, so we convert them here to item frame faces
switch (m_BlockFace)
{
case BLOCK_FACE_ZP: break; // Initialised to zero
case BLOCK_FACE_ZP: Dir = 0; break;
case BLOCK_FACE_ZM: Dir = 2; break;
case BLOCK_FACE_XM: Dir = 1; break;
case BLOCK_FACE_XP: Dir = 3; break;
default: ASSERT(!"Unhandled block face when trying to spawn item frame!"); return;
default:
{
LOGINFO("Invalid face (%d) in a cHangingEntity at {%d, %d, %d}, adjusting to BLOCK_FACE_XP.",
m_BlockFace, (int)GetPosX(), (int)GetPosY(), (int)GetPosZ()
);
Dir = 3;
}
}
if ((Dir == 0) || (Dir == 2)) // Probably a client bug, but two directions are flipped and contrary to the norm, so we do -180