Merge branch 'bugfixes' of git://github.com/tigerw/MCServer into tigerw-bugfixes

Conflicts: source/Blocks/BlockTorch.h
2013-09-15 20:34:22 +02:00
parent f0ab45f65c 526c769b6a
commit 4e200df18c
22 changed files with 165 additions and 229 deletions
@@ -67,12 +67,6 @@ public:
 	}


-	virtual bool CanBePlacedOnSide(void) override
-	{
-		return false;
-	}
-
-
 	virtual bool CanBeAt(int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		return ((a_RelY > 0) && (a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ) != E_BLOCK_AIR));