Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java

src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java

@@ -43,7 +43,7 @@ public abstract class MinecraftServer_scarpetMixin extends ReentrantThreadExecut
     {
         timeReference = lastTimeReference = Util.getMeasuringTimeMs();
         tick(isAhead);
-        runTask();
+        while(runTask()) {Thread.yield();}
     }
 
     @Override