From 307e2c6cacc5aa77e938f34a49cfc9865b285633 Mon Sep 17 00:00:00 2001
From: asofold <asofold@web.de>
Date: Sun, 27 Apr 2014 22:34:25 +0200
Subject: [PATCH] Fix handling move events while in vehicles.

Bug by "refactoring".
---
 .../nocheatplus/checks/moving/MovingListener.java        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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 3904c94c..ca6238e6 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
@@ -375,10 +375,11 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
 		// TODO: Check if vehicle move logs correctly (fake).
 		
 		// Early return checks (no full processing).
-		boolean earlyReturn = false;
+		final boolean earlyReturn;
 		if (player.isInsideVehicle()) {
 			// No full processing for players in vehicles.
 			newTo = onPlayerMoveVehicle(player, from, to, data);
+			earlyReturn = true;
 		} else if (player.isDead() || player.isSleeping()) {
 			// Ignore dead players.
 			data.sfHoverTicks = -1;
@@ -392,10 +393,12 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
 			// Keep hover ticks.
 			// Ignore changing worlds.
 			earlyReturn = true;
-		} // else:  Continue with full processing.
+		} else {
+			earlyReturn = false;
+		}
 		
 		// TODO: Might log base parts here (+extras).
-		if (earlyReturn || newTo != null) {
+		if (earlyReturn) {
 			// TODO: Log "early return: " + tags.
 			if (newTo != null) {
 				// Illegal Yaw/Pitch.