diff --git a/Minecraft.World/PrimedTnt.cpp b/Minecraft.World/PrimedTnt.cpp
index 51ce81d7..c10f3f4e 100644
--- a/Minecraft.World/PrimedTnt.cpp
+++ b/Minecraft.World/PrimedTnt.cpp
@@ -63,59 +63,37 @@ bool PrimedTnt::isPickable()
 
 void PrimedTnt::tick()
 {
-	xo = x;
-	yo = y;
-	zo = z;
-    this->updateInWaterState();
-    bool inWater = this->isInWater() || this->isInLava();
+    xo = x;
+    yo = y;
+    zo = z;
 
-
-     if (inWater)
-    {
-        yd -= 0.0392f;  
-    }
-    else
-    {
-        yd -= 0.04f;   
-    }
+    yd -= 0.04f; 
 
     move(xd, yd, zd);
 
+    xd *= 0.98f;
+    yd *= 0.98f;
+    zd *= 0.98f;
 
-    if (inWater)
+    if (onGround)
     {
-        xd *= 0.8f;
-        yd *= 0.8f;
-        zd *= 0.8f;
+        xd *= 0.7f;
+        zd *= 0.7f;
+        yd *= -0.5f;
+    }
+
+    this->updateInWaterState(); 
+
+    if (life-- <= 0)
+    {
+        remove();
+        if (!level->isClientSide)
+            explode();
     }
     else
     {
-        xd *= 0.98f;
-        yd *= 0.98f;
-        zd *= 0.98f;
+        level->addParticle(eParticleType_smoke, x, y + 0.5f, z, 0, 0, 0);
     }
-
-
-	if (onGround)
-	{
-		xd *= 0.7f;
-		zd *= 0.7f;
-		yd *= -0.5f;
-	}
-
-	if (life-- <= 0)
-	{
-		remove();
-		if (!level->isClientSide)
-		{
-			explode();
-		}
-	}
-	else
-	{
-		level->addParticle(eParticleType_smoke, x, y + 0.5f, z, 0, 0, 0);
-	}
-
 }