Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/mixins/ChunkTicketManager_scarpetMixin.java
#	src/main/java/carpet/mixins/MinecraftServer_coreMixin.java

src/main/java/carpet/mixins/ServerChunkManagerMixin.java

@@ -1,8 +1,10 @@
 package carpet.mixins;
 
+import carpet.fakes.ServerChunkManagerInterface;
 import carpet.utils.SpawnReporter;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import net.minecraft.entity.EntityCategory;
+import net.minecraft.server.world.ChunkTicketManager;
 import net.minecraft.server.world.ServerChunkManager;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
@@ -24,12 +26,20 @@ import java.util.HashMap;
 import java.util.HashSet;
 
 @Mixin(ServerChunkManager.class)
-public abstract class ServerChunkManagerMixin
+public abstract class ServerChunkManagerMixin implements ServerChunkManagerInterface
 {
     @Shadow @Final private ServerWorld world;
 
     @Shadow @Final private static int CHUNKS_ELIGIBLE_FOR_SPAWNING;
 
+    @Shadow @Final private ChunkTicketManager ticketManager;
+
+    @Override // shared between scarpet and spawnChunks setting
+    public ChunkTicketManager getTicketManager()
+    {
+        return ticketManager;
+    }
+
     @Inject(
             method = "tickChunks",
             locals = LocalCapture.CAPTURE_FAILHARD,