From 3ae2c63ee495eaa8c2e803bc4cc74717f1c73393 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Fri, 4 Jul 2014 14:52:05 -0500
Subject: [PATCH] Upstream merge - Move player tick into main loop

---
 Bukkit      | 2 +-
 CraftBukkit | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bukkit b/Bukkit
index 7c0fc96e9e..194fc99e42 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 7c0fc96e9e10cb703190cf78124fad5ea977807a
+Subproject commit 194fc99e42c576550edb59ea932e94105a96d033
diff --git a/CraftBukkit b/CraftBukkit
index b734927224..4ab7d2a464 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit b734927224f585a1b232a3ce1decb155130eda96
+Subproject commit 4ab7d2a464a96dbbed64e3bbcb00d498c7bf7678