Merge branch 'master' into 1.8-Protocol

2014-09-12 13:28:06 +02:00
parent f2c5d8a761 9fd5df26d0
commit bee615b75b
65 changed files with 260 additions and 326 deletions
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -2215,7 +2215,7 @@ bool cChunk::DoWithRedstonePoweredEntityAt(int a_BlockX, int a_BlockY, int a_Blo
 			}
 		}
 		
-		if (a_Callback.Item((cRedstonePoweredEntity *)*itr))
+		if (a_Callback.Item(dynamic_cast<cRedstonePoweredEntity *>(*itr)))  // Needs dynamic_cast due to multiple inheritance
 		{
 			return false;
 		}