Revert "Remove non-fix for MCPC+ bug, thought it was TT.", Spigot changes will be better than ours and are threadsafe anyway.

This reverts commit 1efb3eea756ef2c2ad885ebc238a6b10ba4f3a49.