This commit is contained in:
gnembon committed 2020-02-05 13:56:51 -04:00
1 parent 1cf3b082d9
commit 9fa0e6109b
4 files changed
+24 -22

No files matched your search

@@ -2,9 +2,10 @@ package carpet.mixins;
import carpet.helpers.TickSpeed;
import carpet.utils.CarpetProfiler;
import net.minecraft.class_4758;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.Util;
import net.minecraft.util.profiler.DisableableProfiler;
import net.minecraft.util.profiler.Profiler;
import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
@@ -27,9 +28,9 @@ public abstract class MinecraftServer_tickspeedMixin
@Shadow @Final private static Logger LOGGER;
@Shadow private boolean profilerStartQueued;
//@Shadow private boolean profilerStartQueued;
@Shadow @Final private DisableableProfiler profiler;
@Shadow @Final private Profiler profiler;
@Shadow protected abstract void tick(BooleanSupplier booleanSupplier_1);
@@ -43,6 +44,8 @@ public abstract class MinecraftServer_tickspeedMixin
@Shadow private volatile boolean loading;
@Shadow protected abstract void method_24487(class_4758 arg);
CarpetProfiler.ProfilerToken currentSection;
private float carpetMsptAccum = 0.0f;
@@ -105,12 +108,8 @@ public abstract class MinecraftServer_tickspeedMixin
}
this.timeReference += msThisTick;//50L;
if (this.profilerStartQueued)
{
this.profilerStartQueued = false;
this.profiler.getController().enable();
}
class_4758 lv = class_4758.method_24341("Server");
this.method_24487(lv);
this.profiler.startTick();
this.profiler.push("tick");
this.tick(TickSpeed.time_warp_start_time != 0 ? ()->true : this::shouldKeepTicking);