Merge branch 'master' into 1.8-Protocol

2014-09-12 14:09:07 +02:00 · 2014-09-12 14:09:07 +02:00 · fb68382d9b
parent 009d9bbe46 abcae75992
commit fb68382d9b
1 changed files with 2 additions and 1 deletions
--- a/src/Blocks/BlockOre.h
+++ b/src/Blocks/BlockOre.h
@ -51,7 +51,8 @@ public:
 			}
 			default:
 			{
-				ASSERT(!"Unhandled ore!");
+				a_Pickups.push_back(cItem(m_BlockType));
+				break;
 			}
 		}
 	}