From 43e684071933adef93040e8d4b830d5c6b71cf9a Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 12 Jan 2013 04:46:01 +0000 Subject: Merged branch "branches/hooks" into "trunk". git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Items/ItemSlab.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/Items/ItemSlab.h') diff --git a/source/Items/ItemSlab.h b/source/Items/ItemSlab.h index 174beae22..42311d54d 100644 --- a/source/Items/ItemSlab.h +++ b/source/Items/ItemSlab.h @@ -27,9 +27,9 @@ public: ((a_Dir == 0) || (a_Dir == 1)) // Only when clicking on top or on bottom of the block && ((Block == E_BLOCK_WOODEN_SLAB) || (Block == E_BLOCK_STONE_SLAB)) // It is a slab && (Block == a_Item->m_ItemType) // Same slab - && ((Meta & 0x7) == (a_Item->m_ItemHealth & 0x7))) // Same Texture + && ((Meta & 0x7) == (a_Item->m_ItemDamage & 0x7))) // Same Texture { - if(a_Player->GetGameMode() == eGameMode_Creative) + if (a_Player->GetGameMode() == eGameMode_Creative) { a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, Block - 1, Meta); // Block - 1 simple hack to save one if statement return true; -- cgit v1.2.3