diff --git a/Minecraft.World/Arrow.cpp b/Minecraft.World/Arrow.cpp
index 1f26bada..4f2c4161 100644
--- a/Minecraft.World/Arrow.cpp
+++ b/Minecraft.World/Arrow.cpp
@@ -445,7 +445,13 @@ void Arrow::tick()
 			float s = 1 / 4.0f;
 			level->addParticle(eParticleType_bubble, x - xd * s, y - yd * s, z - zd * s, xd, yd, zd);
 		}
-		inertia = 0.80f;
+		inertia *= 0.1f;
+		gravity *= 2.0f;
+	}
+
+	if (isInLava())
+	{
+		setOnFire(100);
 	}
 
 	xd *= inertia;