Tidy of code and much more work with the new BukkitProtect API