Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-09-17 09:38:01 -03:00
commit bde05ee7c8
1 file changed
+1 -1
@@ -98,7 +98,7 @@ public abstract class MinecraftServer_tickspeedMixin
this.profiler.startTick();
this.profiler.push("tick");
this.tick(this::shouldKeepTicking);
this.tick(TickSpeed.time_warp_start_time != 0 ? ()->true : this::shouldKeepTicking);
this.profiler.swap("nextTickWait");
this.field_19249 = true;
this.field_19248 = Math.max(SystemUtil.getMeasuringTimeMs() + /*50L*/ mspt, this.timeReference);