From 7482111951dc80962751253a3b8beb0ae9da7076 Mon Sep 17 00:00:00 2001
From: Ross Allan <rallanpcl@gmail.com>
Date: Wed, 3 Jul 2013 21:45:38 +0100
Subject: [PATCH] Fully revert to vanilla movement updates when concurrent
 movement updates are disabled.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
---
 .../nallar/patched/network/PatchPacket10Flying.java       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/common/nallar/patched/network/PatchPacket10Flying.java b/src/common/nallar/patched/network/PatchPacket10Flying.java
index 7d045417..4e2cac8b 100644
--- a/src/common/nallar/patched/network/PatchPacket10Flying.java
+++ b/src/common/nallar/patched/network/PatchPacket10Flying.java
@@ -23,10 +23,12 @@
 import net.minecraftforge.event.world.ChunkWatchEvent;
 
 public abstract class PatchPacket10Flying extends Packet10Flying {
+	private static final boolean concurrent = TickThreading.instance.concurrentMovementUpdates;
+
 	@Override
 	@Declare
 	public boolean canProcessAsync() {
-		return TickThreading.instance.concurrentMovementUpdates;
+		return concurrent;
 	}
 
 	@Override
@@ -38,6 +40,10 @@ public void processPacket(NetHandler par1NetHandler) {
 		NetServerHandler nsh = (NetServerHandler) par1NetHandler;
 		EntityPlayerMP entityPlayerMP = nsh.playerEntity;
 		sendChunks(entityPlayerMP);
+		if (!concurrent) {
+			nsh.handleFlying(this);
+			return;
+		}
 		boolean mainThreadProcess = false;
 		if (nsh.teleported > 22 || entityPlayerMP.ridingEntity != null) {
 			if (Thread.currentThread() instanceof TcpReaderThread) {