1 files changed, 8 insertions, 7 deletions

diff --git a/src/Items/ItemItemFrame.h b/src/Items/ItemItemFrame.h
index 39be48b54..a403778ad 100644
--- a/src/Items/ItemItemFrame.h
+++ b/src/Items/ItemItemFrame.h
@@ -23,23 +23,24 @@ public:
 	{
 		if (a_Dir == BLOCK_FACE_NONE)
 		{
+			// Client sends this if clicked on top or bottom face
 			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);
-		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)
 		{
 			int Dir = 0;
 			switch (a_Dir)
 			{
-				case BLOCK_FACE_SOUTH: break;
-				case BLOCK_FACE_NORTH: Dir = 2; break;
-				case BLOCK_FACE_WEST: Dir = 1; break;
-				case BLOCK_FACE_EAST: Dir = 3; break;
-				default: return false;
+				case BLOCK_FACE_ZP: break; // Initialised to zero
+				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 spawn item frame!"); return false;
 			}
 
 			cItemFrame * ItemFrame = new cItemFrame(Dir, a_BlockX, a_BlockY, a_BlockZ);