Preparation for CraftBukkit 1.5 R0.1 (Will break)

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>