Updated for CraftBukkit 1.42 R1.0