Updated for Craftbukkit 1.5.1-R0.2