Reapplied missing Spigot Structure Save patch.