- Updated Upstream (Bukkit/CraftBukkit) (#7411)
- [ci skip] Fix param mismatch from last commit
- [ci skip] Update parameter mappings
