Updated to work with Craftbukkit Build #03116