From c93edcbbe9828877fe69b3f6bac4b58eafc3931e Mon Sep 17 00:00:00 2001
From: asofold <asofold@web.de>
Date: Thu, 15 May 2014 10:44:34 +0200
Subject: [PATCH] Remove direction correction, as it does not seem to be
 effective.

---
 .../compat/bukkit/MCAccessBukkit.java         |  8 +++----
 .../compat/cb2512/MCAccessCB2512.java         | 17 +++++++-------
 .../compat/cb2545/MCAccessCB2545.java         | 17 +++++++-------
 .../compat/cb2602/MCAccessCB2602.java         | 17 +++++++-------
 .../compat/cb2645/MCAccessCB2645.java         | 17 +++++++-------
 .../compat/cb2691/MCAccessCB2691.java         | 17 +++++++-------
 .../compat/cb2763/MCAccessCB2763.java         | 17 +++++++-------
 .../compat/cb2794/MCAccessCB2794.java         | 17 +++++++-------
 .../compat/cb2808/MCAccessCB2808.java         | 17 +++++++-------
 .../compat/cb2882/MCAccessCB2882.java         | 17 +++++++-------
 .../compat/cb2922/MCAccessCB2922.java         | 18 +++++++--------
 .../compat/cb3026/MCAccessCB3026.java         | 17 +++++++-------
 .../compat/cbdev/MCAccessCBDev.java           | 17 +++++++-------
 .../checks/fight/FightListener.java           | 20 ++++++++---------
 .../checks/moving/MovingListener.java         | 18 +++++++--------
 .../nocheatplus/compat/MCAccess.java          | 10 ++++-----
 .../nocheatplus/players/PlayerTask.java       | 22 +++++++++----------
 17 files changed, 134 insertions(+), 149 deletions(-)

diff --git a/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkit.java b/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkit.java
index e4853e5b..a4b7631e 100644
--- a/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkit.java
+++ b/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkit.java
@@ -233,9 +233,9 @@ public class MCAccessBukkit implements MCAccess, BlockPropertiesSetup{
 		}
 	}
 
-	@Override
-	public void correctDirection(Player player) {
-		// TODO: Consider using reflection (detect CraftPlayer, access EntityPlayer + check if possible (!), use flags for if valid or invalid.)
-	}
+//	@Override
+//	public void correctDirection(Player player) {
+//		// TODO: Consider using reflection (detect CraftPlayer, access EntityPlayer + check if possible (!), use flags for if valid or invalid.)
+//	}
 	
 }
diff --git a/NCPCompatCB2512/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/MCAccessCB2512.java b/NCPCompatCB2512/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/MCAccessCB2512.java
index 3b354e8f..aac825cb 100644
--- a/NCPCompatCB2512/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/MCAccessCB2512.java
+++ b/NCPCompatCB2512/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/MCAccessCB2512.java
@@ -18,7 +18,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import fr.neatmonster.nocheatplus.checks.moving.LocUtil;
 import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
 import fr.neatmonster.nocheatplus.compat.MCAccess;
 import fr.neatmonster.nocheatplus.utilities.BlockCache;
@@ -163,13 +162,13 @@ public class MCAccessCB2512 implements MCAccess{
 		}
 	}
 	
-	@Override
-	public void correctDirection(final Player player) {
-		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
-		// Main direction.
-		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
-		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
-		// Consider setting the lastYaw here too.
-	}
+//	@Override
+//	public void correctDirection(final Player player) {
+//		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+//		// Main direction.
+//		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
+//		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
+//		// Consider setting the lastYaw here too.
+//	}
 	
 }
diff --git a/NCPCompatCB2545/src/main/java/fr/neatmonster/nocheatplus/compat/cb2545/MCAccessCB2545.java b/NCPCompatCB2545/src/main/java/fr/neatmonster/nocheatplus/compat/cb2545/MCAccessCB2545.java
index a63065cc..2c2dbd5b 100644
--- a/NCPCompatCB2545/src/main/java/fr/neatmonster/nocheatplus/compat/cb2545/MCAccessCB2545.java
+++ b/NCPCompatCB2545/src/main/java/fr/neatmonster/nocheatplus/compat/cb2545/MCAccessCB2545.java
@@ -18,7 +18,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import fr.neatmonster.nocheatplus.checks.moving.LocUtil;
 import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
 import fr.neatmonster.nocheatplus.compat.MCAccess;
 import fr.neatmonster.nocheatplus.utilities.BlockCache;
@@ -163,13 +162,13 @@ public class MCAccessCB2545 implements MCAccess{
 		}
 	}
 	
-	@Override
-	public void correctDirection(final Player player) {
-		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
-		// Main direction.
-		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
-		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
-		// Consider setting the lastYaw here too.
-	}
+//	@Override
+//	public void correctDirection(final Player player) {
+//		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+//		// Main direction.
+//		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
+//		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
+//		// Consider setting the lastYaw here too.
+//	}
 	
 }
diff --git a/NCPCompatCB2602/src/main/java/fr/neatmonster/nocheatplus/compat/cb2602/MCAccessCB2602.java b/NCPCompatCB2602/src/main/java/fr/neatmonster/nocheatplus/compat/cb2602/MCAccessCB2602.java
index a34e5e35..07d9c53d 100644
--- a/NCPCompatCB2602/src/main/java/fr/neatmonster/nocheatplus/compat/cb2602/MCAccessCB2602.java
+++ b/NCPCompatCB2602/src/main/java/fr/neatmonster/nocheatplus/compat/cb2602/MCAccessCB2602.java
@@ -18,7 +18,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import fr.neatmonster.nocheatplus.checks.moving.LocUtil;
 import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
 import fr.neatmonster.nocheatplus.compat.MCAccess;
 import fr.neatmonster.nocheatplus.utilities.BlockCache;
@@ -165,13 +164,13 @@ public class MCAccessCB2602 implements MCAccess{
 		}
 	}
 	
-	@Override
-	public void correctDirection(final Player player) {
-		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
-		// Main direction.
-		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
-		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
-		// Consider setting the lastYaw here too.
-	}
+//	@Override
+//	public void correctDirection(final Player player) {
+//		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+//		// Main direction.
+//		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
+//		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
+//		// Consider setting the lastYaw here too.
+//	}
 	
 }
diff --git a/NCPCompatCB2645/src/main/java/fr/neatmonster/nocheatplus/compat/cb2645/MCAccessCB2645.java b/NCPCompatCB2645/src/main/java/fr/neatmonster/nocheatplus/compat/cb2645/MCAccessCB2645.java
index 86a6b061..9c8e27dc 100644
--- a/NCPCompatCB2645/src/main/java/fr/neatmonster/nocheatplus/compat/cb2645/MCAccessCB2645.java
+++ b/NCPCompatCB2645/src/main/java/fr/neatmonster/nocheatplus/compat/cb2645/MCAccessCB2645.java
@@ -18,7 +18,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import fr.neatmonster.nocheatplus.checks.moving.LocUtil;
 import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
 import fr.neatmonster.nocheatplus.compat.MCAccess;
 import fr.neatmonster.nocheatplus.utilities.BlockCache;
@@ -165,13 +164,13 @@ public class MCAccessCB2645 implements MCAccess{
 		}
 	}
 	
-	@Override
-	public void correctDirection(final Player player) {
-		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
-		// Main direction.
-		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
-		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
-		// Consider setting the lastYaw here too.
-	}
+//	@Override
+//	public void correctDirection(final Player player) {
+//		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+//		// Main direction.
+//		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
+//		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
+//		// Consider setting the lastYaw here too.
+//	}
 	
 }
diff --git a/NCPCompatCB2691/src/main/java/fr/neatmonster/nocheatplus/compat/cb2691/MCAccessCB2691.java b/NCPCompatCB2691/src/main/java/fr/neatmonster/nocheatplus/compat/cb2691/MCAccessCB2691.java
index 2ae5701e..6988eaf1 100644
--- a/NCPCompatCB2691/src/main/java/fr/neatmonster/nocheatplus/compat/cb2691/MCAccessCB2691.java
+++ b/NCPCompatCB2691/src/main/java/fr/neatmonster/nocheatplus/compat/cb2691/MCAccessCB2691.java
@@ -18,7 +18,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import fr.neatmonster.nocheatplus.checks.moving.LocUtil;
 import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
 import fr.neatmonster.nocheatplus.compat.MCAccess;
 import fr.neatmonster.nocheatplus.utilities.BlockCache;
@@ -167,13 +166,13 @@ public class MCAccessCB2691 implements MCAccess{
 		}
 	}
 	
-	@Override
-	public void correctDirection(final Player player) {
-		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
-		// Main direction.
-		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
-		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
-		// Consider setting the lastYaw here too.
-	}
+//	@Override
+//	public void correctDirection(final Player player) {
+//		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+//		// Main direction.
+//		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
+//		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
+//		// Consider setting the lastYaw here too.
+//	}
 	
 }
diff --git a/NCPCompatCB2763/src/main/java/fr/neatmonster/nocheatplus/compat/cb2763/MCAccessCB2763.java b/NCPCompatCB2763/src/main/java/fr/neatmonster/nocheatplus/compat/cb2763/MCAccessCB2763.java
index 79da52e7..698a48f6 100644
--- a/NCPCompatCB2763/src/main/java/fr/neatmonster/nocheatplus/compat/cb2763/MCAccessCB2763.java
+++ b/NCPCompatCB2763/src/main/java/fr/neatmonster/nocheatplus/compat/cb2763/MCAccessCB2763.java
@@ -18,7 +18,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import fr.neatmonster.nocheatplus.checks.moving.LocUtil;
 import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
 import fr.neatmonster.nocheatplus.compat.MCAccess;
 import fr.neatmonster.nocheatplus.utilities.BlockCache;
@@ -166,13 +165,13 @@ public class MCAccessCB2763 implements MCAccess{
 		}
 	}
 	
-	@Override
-	public void correctDirection(final Player player) {
-		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
-		// Main direction.
-		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
-		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
-		// Consider setting the lastYaw here too.
-	}
+//	@Override
+//	public void correctDirection(final Player player) {
+//		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+//		// Main direction.
+//		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
+//		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
+//		// Consider setting the lastYaw here too.
+//	}
 	
 }
diff --git a/NCPCompatCB2794/src/main/java/fr/neatmonster/nocheatplus/compat/cb2794/MCAccessCB2794.java b/NCPCompatCB2794/src/main/java/fr/neatmonster/nocheatplus/compat/cb2794/MCAccessCB2794.java
index 0a020289..de8828d9 100644
--- a/NCPCompatCB2794/src/main/java/fr/neatmonster/nocheatplus/compat/cb2794/MCAccessCB2794.java
+++ b/NCPCompatCB2794/src/main/java/fr/neatmonster/nocheatplus/compat/cb2794/MCAccessCB2794.java
@@ -18,7 +18,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import fr.neatmonster.nocheatplus.checks.moving.LocUtil;
 import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
 import fr.neatmonster.nocheatplus.compat.MCAccess;
 import fr.neatmonster.nocheatplus.utilities.BlockCache;
@@ -160,13 +159,13 @@ public class MCAccessCB2794 implements MCAccess{
 		return mat.hasGravity();
 	}
 	
-	@Override
-	public void correctDirection(final Player player) {
-		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
-		// Main direction.
-		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
-		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
-		// Consider setting the lastYaw here too.
-	}
+//	@Override
+//	public void correctDirection(final Player player) {
+//		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+//		// Main direction.
+//		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
+//		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
+//		// Consider setting the lastYaw here too.
+//	}
 	
 }
diff --git a/NCPCompatCB2808/src/main/java/fr/neatmonster/nocheatplus/compat/cb2808/MCAccessCB2808.java b/NCPCompatCB2808/src/main/java/fr/neatmonster/nocheatplus/compat/cb2808/MCAccessCB2808.java
index 69738914..6569d10d 100644
--- a/NCPCompatCB2808/src/main/java/fr/neatmonster/nocheatplus/compat/cb2808/MCAccessCB2808.java
+++ b/NCPCompatCB2808/src/main/java/fr/neatmonster/nocheatplus/compat/cb2808/MCAccessCB2808.java
@@ -18,7 +18,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import fr.neatmonster.nocheatplus.checks.moving.LocUtil;
 import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
 import fr.neatmonster.nocheatplus.compat.MCAccess;
 import fr.neatmonster.nocheatplus.utilities.BlockCache;
@@ -161,13 +160,13 @@ public class MCAccessCB2808 implements MCAccess{
 		return mat.hasGravity();
 	}
 	
-	@Override
-	public void correctDirection(final Player player) {
-		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
-		// Main direction.
-		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
-		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
-		// Consider setting the lastYaw here too.
-	}
+//	@Override
+//	public void correctDirection(final Player player) {
+//		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+//		// Main direction.
+//		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
+//		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
+//		// Consider setting the lastYaw here too.
+//	}
 	
 }
diff --git a/NCPCompatCB2882/src/main/java/fr/neatmonster/nocheatplus/compat/cb2882/MCAccessCB2882.java b/NCPCompatCB2882/src/main/java/fr/neatmonster/nocheatplus/compat/cb2882/MCAccessCB2882.java
index 9e04f60b..4dc894c4 100644
--- a/NCPCompatCB2882/src/main/java/fr/neatmonster/nocheatplus/compat/cb2882/MCAccessCB2882.java
+++ b/NCPCompatCB2882/src/main/java/fr/neatmonster/nocheatplus/compat/cb2882/MCAccessCB2882.java
@@ -18,7 +18,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import fr.neatmonster.nocheatplus.checks.moving.LocUtil;
 import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
 import fr.neatmonster.nocheatplus.compat.MCAccess;
 import fr.neatmonster.nocheatplus.utilities.BlockCache;
@@ -162,13 +161,13 @@ public class MCAccessCB2882 implements MCAccess{
 		return mat.hasGravity();
 	}
 	
-	@Override
-	public void correctDirection(final Player player) {
-		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
-		// Main direction.
-		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
-		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
-		// Consider setting the lastYaw here too.
-	}
+//	@Override
+//	public void correctDirection(final Player player) {
+//		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+//		// Main direction.
+//		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
+//		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
+//		// Consider setting the lastYaw here too.
+//	}
 	
 }
diff --git a/NCPCompatCB2922/src/main/java/fr/neatmonster/nocheatplus/compat/cb2922/MCAccessCB2922.java b/NCPCompatCB2922/src/main/java/fr/neatmonster/nocheatplus/compat/cb2922/MCAccessCB2922.java
index c3369683..9e5499ac 100644
--- a/NCPCompatCB2922/src/main/java/fr/neatmonster/nocheatplus/compat/cb2922/MCAccessCB2922.java
+++ b/NCPCompatCB2922/src/main/java/fr/neatmonster/nocheatplus/compat/cb2922/MCAccessCB2922.java
@@ -18,10 +18,8 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import fr.neatmonster.nocheatplus.checks.moving.LocUtil;
 import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
 import fr.neatmonster.nocheatplus.compat.MCAccess;
-import fr.neatmonster.nocheatplus.compat.cb2922.BlockCacheCB2922;
 import fr.neatmonster.nocheatplus.utilities.BlockCache;
 import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
 
@@ -163,13 +161,13 @@ public class MCAccessCB2922 implements MCAccess{
 		return mat.hasGravity();
 	}
 	
-	@Override
-	public void correctDirection(final Player player) {
-		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
-		// Main direction.
-		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
-		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
-		// Consider setting the lastYaw here too.
-	}
+//	@Override
+//	public void correctDirection(final Player player) {
+//		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+//		// Main direction.
+//		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
+//		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
+//		// Consider setting the lastYaw here too.
+//	}
 	
 }
diff --git a/NCPCompatCB3026/src/main/java/fr/neatmonster/nocheatplus/compat/cb3026/MCAccessCB3026.java b/NCPCompatCB3026/src/main/java/fr/neatmonster/nocheatplus/compat/cb3026/MCAccessCB3026.java
index 97cc9340..21f6ce64 100644
--- a/NCPCompatCB3026/src/main/java/fr/neatmonster/nocheatplus/compat/cb3026/MCAccessCB3026.java
+++ b/NCPCompatCB3026/src/main/java/fr/neatmonster/nocheatplus/compat/cb3026/MCAccessCB3026.java
@@ -18,7 +18,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import fr.neatmonster.nocheatplus.checks.moving.LocUtil;
 import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
 import fr.neatmonster.nocheatplus.compat.MCAccess;
 import fr.neatmonster.nocheatplus.utilities.BlockCache;
@@ -162,13 +161,13 @@ public class MCAccessCB3026 implements MCAccess{
 		return mat.hasGravity();
 	}
 	
-	@Override
-	public void correctDirection(final Player player) {
-		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
-		// Main direction.
-		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
-		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
-		// Consider setting the lastYaw here too.
-	}
+//	@Override
+//	public void correctDirection(final Player player) {
+//		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+//		// Main direction.
+//		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
+//		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
+//		// Consider setting the lastYaw here too.
+//	}
 	
 }
diff --git a/NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/MCAccessCBDev.java b/NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/MCAccessCBDev.java
index 126ab08d..785a0368 100644
--- a/NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/MCAccessCBDev.java
+++ b/NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/MCAccessCBDev.java
@@ -18,7 +18,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import fr.neatmonster.nocheatplus.checks.moving.LocUtil;
 import fr.neatmonster.nocheatplus.compat.AlmostBoolean;
 import fr.neatmonster.nocheatplus.compat.MCAccess;
 import fr.neatmonster.nocheatplus.utilities.BlockCache;
@@ -181,13 +180,13 @@ public class MCAccessCBDev implements MCAccess{
 		return mat.hasGravity();
 	}
 	
-	@Override
-	public void correctDirection(final Player player) {
-		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
-		// Main direction.
-		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
-		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
-		// Consider setting the lastYaw here too.
-	}
+//	@Override
+//	public void correctDirection(final Player player) {
+//		final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
+//		// Main direction.
+//		mcPlayer.yaw = LocUtil.correctYaw(mcPlayer.yaw);
+//		mcPlayer.pitch = LocUtil.correctPitch(mcPlayer.pitch);
+//		// Consider setting the lastYaw here too.
+//	}
 	
 }
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java
index 6c16e0d0..bcf74384 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java
@@ -115,11 +115,11 @@ public class FightListener extends CheckListener implements JoinLeaveListener{
         final boolean worldChanged = !worldName.equals(data.lastWorld);
         
         final Location loc =  player.getLocation(useLoc1);
-        // Bad pitch/yaw, just in case.
- 		if (LocUtil.needsDirectionCorrection(useLoc1.getYaw(), useLoc1.getPitch())) {
- 			mcAccess.correctDirection(player);
- 			player.getLocation(useLoc1);
- 		}
+//        // Bad pitch/yaw, just in case.
+// 		if (LocUtil.needsDirectionCorrection(useLoc1.getYaw(), useLoc1.getPitch())) {
+// 			mcAccess.correctDirection(player);
+// 			player.getLocation(useLoc1);
+// 		}
         final Location damagedLoc = damaged.getLocation(useLoc2);
 //        final double targetDist = CheckUtils.distance(loc, targetLoc); // TODO: Calculate distance as is done in fight.reach !
         final double targetMove;
@@ -150,11 +150,11 @@ public class FightListener extends CheckListener implements JoinLeaveListener{
         final Player damagedPlayer;
         if (damaged instanceof Player){
         	damagedPlayer = (Player) damaged;
-        	// Bad pitch/yaw, just in case.
-     		if (LocUtil.needsDirectionCorrection(useLoc2.getYaw(), useLoc2.getPitch())) {
-     			mcAccess.correctDirection(damagedPlayer);
-     			damagedPlayer.getLocation(useLoc2);
-     		}
+//        	// Bad pitch/yaw, just in case.
+//     		if (LocUtil.needsDirectionCorrection(useLoc2.getYaw(), useLoc2.getPitch())) {
+//     			mcAccess.correctDirection(damagedPlayer);
+//     			damagedPlayer.getLocation(useLoc2);
+//     		}
      		// Log.
         	if (cc.debug && damagedPlayer.hasPermission(Permissions.ADMINISTRATION_DEBUG)){
         		damagedPlayer.sendMessage("Attacked by " + player.getName() + ": inv=" + mcAccess.getInvulnerableTicks(damagedPlayer) + " ndt=" + damagedPlayer.getNoDamageTicks());
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
index 4fc90f37..ecbc81ad 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
@@ -366,11 +366,11 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
 		final Location to = event.getTo();
 		Location newTo = null;
 		
-		// Check problematic yaw/pitch values.
-		if (LocUtil.needsDirectionCorrection(from.getYaw(), from.getPitch())
-				|| LocUtil.needsDirectionCorrection(to.getYaw(), to.getPitch())) {
-			DataManager.getPlayerData(player).task.correctDirection();
-		}
+//		// Check problematic yaw/pitch values.
+//		if (LocUtil.needsDirectionCorrection(from.getYaw(), from.getPitch())
+//				|| LocUtil.needsDirectionCorrection(to.getYaw(), to.getPitch())) {
+//			DataManager.getPlayerData(player).task.correctDirection();
+//		}
 		
 		// TODO: Check illegal moves here anyway (!).
 		// TODO: Check if vehicle move logs correctly (fake).
@@ -1282,10 +1282,10 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
 		// Hover.
 		initHover(player, data, cc, data.toWasReset); // isOnGroundOrResetCond
 		
-		// Bad pitch/yaw, just in case.
-		if (LocUtil.needsDirectionCorrection(useLoc.getYaw(), useLoc.getPitch())) {
-			DataManager.getPlayerData(player).task.correctDirection();
-		}
+//		// Bad pitch/yaw, just in case.
+//		if (LocUtil.needsDirectionCorrection(useLoc.getYaw(), useLoc.getPitch())) {
+//			DataManager.getPlayerData(player).task.correctDirection();
+//		}
 	}
 
 	/**
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/MCAccess.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/MCAccess.java
index 84bebd26..b6b3cf2b 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/MCAccess.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/MCAccess.java
@@ -136,11 +136,11 @@ public interface MCAccess {
 	 */
 	public boolean hasGravity(Material type);
 	
-	/**
-	 * Correct the direction (yaw + pitch). If this can't be done lightly it should just do nothing. Check pitch and yaw before calling, use auxiliary methods from LocUtil.
-	 * @param player
-	 */
-	public void correctDirection(Player player);
+//	/**
+//	 * Correct the direction (yaw + pitch). If this can't be done lightly it should just do nothing. Check pitch and yaw before calling, use auxiliary methods from LocUtil.
+//	 * @param player
+//	 */
+//	public void correctDirection(Player player);
 	
 	
 }
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/players/PlayerTask.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/players/PlayerTask.java
index 2a49c720..8aea0559 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/players/PlayerTask.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/players/PlayerTask.java
@@ -2,8 +2,6 @@ package fr.neatmonster.nocheatplus.players;
 
 import org.bukkit.entity.Player;
 
-import fr.neatmonster.nocheatplus.NCPAPIProvider;
-import fr.neatmonster.nocheatplus.compat.MCAccess;
 import fr.neatmonster.nocheatplus.utilities.OnDemandTickListener;
 
 /**
@@ -19,7 +17,7 @@ public class PlayerTask extends OnDemandTickListener {
 	
 	protected boolean updateInventory = false;
 	
-	protected boolean correctDirection = false;
+//	protected boolean correctDirection = false;
 
 	/**
 	 * 
@@ -36,10 +34,10 @@ public class PlayerTask extends OnDemandTickListener {
 		final Player player = DataManager.getPlayer(lcName);
 		if (player != null) {
 			if (player.isOnline()) {
-				if (correctDirection) {
-					final MCAccess access = NCPAPIProvider.getNoCheatPlusAPI().getMCAccess();
-					access.correctDirection(player);
-				}
+//				if (correctDirection) {
+//					final MCAccess access = NCPAPIProvider.getNoCheatPlusAPI().getMCAccess();
+//					access.correctDirection(player);
+//				}
 				if (updateInventory) {
 					player.updateInventory();
 				}
@@ -47,7 +45,7 @@ public class PlayerTask extends OnDemandTickListener {
 		}
 		// Reset values (players logging back in should be fine or handled differently).
 		updateInventory = false;
-		correctDirection = false;
+//		correctDirection = false;
 		return false;
 	}
 	
@@ -57,10 +55,10 @@ public class PlayerTask extends OnDemandTickListener {
 		register();
 	}
 	
-	public void correctDirection() {
-		correctDirection = true;
-		register();
-	}
+//	public void correctDirection() {
+//		correctDirection = true;
+//		register();
+//	}
 	
 	// TODO: updateHunger