Use setters and getters for frozen state, separate superHot and

don't tick regular tick events
This commit is contained in:
altrisi committed 2020-12-29 16:00:07 +01:00
1 parent 33347baaf7
commit 6d3ac93e4c
9 files changed
+71 -25

No files matched your search

@@ -18,6 +18,6 @@ public class ChunkTicketManager_tickMixin
{
// pausing expiry of tickets
// that will prevent also chunks from unloading, so require a deep frozen state
if (!TickSpeed.process_entities && TickSpeed.deepFreeze) age--;
if (!TickSpeed.process_entities && TickSpeed.deeplyFrozen()) age--;
}
}
@@ -16,7 +16,7 @@ public class CommandFunctionManager_tickMixin
@Inject(method = "tick", at = @At("HEAD"), cancellable = true)
private void beforeDatapacks(CallbackInfo ci)
{
if (!TickSpeed.process_entities && TickSpeed.deepFreeze) ci.cancel();
if (!TickSpeed.process_entities) ci.cancel();
else
currentSection = CarpetProfiler.start_section(null, "Datapacks", CarpetProfiler.TYPE.GENERAL);
}
@@ -28,7 +28,7 @@ public class MinecraftClientMixin
if (this.world != null) {
if (CarpetServer.minecraft_server == null)
TickSpeed.tick();
if (!TickSpeed.process_entities && TickSpeed.deepFreeze)
if (!TickSpeed.process_entities && TickSpeed.deeplyFrozen())
CarpetClient.shapes.renewShapes();
}
}
@@ -70,7 +70,7 @@ public abstract class MinecraftServer_scarpetMixin extends ReentrantThreadExecut
))
public void tickTasks(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
{
if (!TickSpeed.process_entities && TickSpeed.deepFreeze)
if (!TickSpeed.process_entities)
return;
TICK.onTick();
NETHER_TICK.onTick();