Fix merge conflicts 

Synchronize free map ID allocations to avoid thread issues when creat… …ing maps in multiple threads This was already fixed in Folia but I forgot to do these changes on SparklyPaper