From 1984c2cc77ace7a5e9bbe66b1fab735e8f88498e Mon Sep 17 00:00:00 2001 From: gnembon Date: Sun, 8 Dec 2019 13:14:31 -0400 Subject: [PATCH] fixed profiler counting be time in e time --- src/main/java/carpet/mixins/ServerWorld_tickMixin.java | 6 +++++- src/main/java/carpet/utils/CarpetProfiler.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/carpet/mixins/ServerWorld_tickMixin.java b/src/main/java/carpet/mixins/ServerWorld_tickMixin.java index d630ec48..1f50c789 100644 --- a/src/main/java/carpet/mixins/ServerWorld_tickMixin.java +++ b/src/main/java/carpet/mixins/ServerWorld_tickMixin.java @@ -108,7 +108,11 @@ public abstract class ServerWorld_tickMixin extends World } } - @Inject(method = "tick", at = @At("TAIL")) + @Inject(method = "tick", at = @At( + value = "INVOKE", + target = "Lnet/minecraft/server/world/ServerWorld;tickBlockEntities()V", + shift = At.Shift.BEFORE + )) private void endEntitySection(BooleanSupplier booleanSupplier_1, CallbackInfo ci) { CarpetProfiler.end_current_section(currentSection); diff --git a/src/main/java/carpet/utils/CarpetProfiler.java b/src/main/java/carpet/utils/CarpetProfiler.java index 1548fa06..4370de9a 100644 --- a/src/main/java/carpet/utils/CarpetProfiler.java +++ b/src/main/java/carpet/utils/CarpetProfiler.java @@ -212,7 +212,7 @@ public class CarpetProfiler long total_tick_time = time_repo.get("tick"); double divider = 1.0D / tick_health_requested / 1000000; Messenger.m(currentRequester, "w "); - Messenger.m(currentRequester, String.format("gi Average tick time: %.3fms", divider * total_tick_time)); + Messenger.m(currentRequester, String.format("gi Avg. server tick time: %.3fms", divider * total_tick_time)); long accumulated = 0L; for (String section : GENERAL_SECTIONS) @@ -247,7 +247,7 @@ public class CarpetProfiler double amount = divider * time_repo.get(dimension + "." + section); if (amount > 0.01) { - if (!(section.endsWith("(client)"))) + if (!(section.endsWith("(Client)"))) accumulated += time_repo.get(dimension + "." + section); Messenger.m(currentRequester, String.format("gi - %s: %.3fms", section, amount)); }