Merge devel into master (#78)

* * Turn survival back on for now.

* * Add TP command.

* * Fix fall damage reset.

* * Mob hitting works.

I've disabled entity shading though. Will get back to it at some point, promise!

* * Knockback

* * Mobs now rotate when they die.

* * Fire fix

source/world/item/ItemInstance.cpp

@@ -176,6 +176,11 @@ bool ItemInstance::matches(ItemInstance* a1, ItemInstance* a2)
 	return a1->matches(a2);
 }
 
+int ItemInstance::getAttackDamage(Entity *pEnt)
+{
+	return getItem()->getAttackDamage(pEnt);
+}
+
 void ItemInstance::mineBlock(int x, int y, int z, int d)
 {
 	return getItem()->mineBlock(this, x, y, z, d);