Upstream merge - Move player tick into main loop

This commit is contained in:
Zach Brown 2014-07-04 14:52:05 -05:00
parent 3709c87cb8
commit 3ae2c63ee4
2 changed files with 2 additions and 2 deletions

2
Bukkit

@ -1 +1 @@
Subproject commit 7c0fc96e9e10cb703190cf78124fad5ea977807a Subproject commit 194fc99e42c576550edb59ea932e94105a96d033

@ -1 +1 @@
Subproject commit b734927224f585a1b232a3ce1decb155130eda96 Subproject commit 4ab7d2a464a96dbbed64e3bbcb00d498c7bf7678