23w43a
This commit is contained in:
1 parent
1a7e8b6875
commit
382706a6df
23 files changed
+58
-224
No files matched your search
@@ -1369,7 +1369,7 @@ public class CarpetEventServer
|
||||
|
||||
public void tick()
|
||||
{
|
||||
if (Vanilla.isTickProcessingPaused(scriptServer.server))
|
||||
if (!scriptServer.server.tickRateManager().runsNormally())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -366,10 +366,4 @@ public class Vanilla
|
||||
return new BlockPredicatePayload(predicateData.getCMBlockState(), predicateData.getCMBlockTagKey(), predicateData.getCMProperties(), predicateData.getCMDataTag());
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isTickProcessingPaused(MinecraftServer server)
|
||||
{
|
||||
return !((MinecraftServerInterface)server).getTickRateManager().runsNormally();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -134,7 +134,7 @@ public class SystemInfo
|
||||
// might be off one tick when run in the off tasks or asynchronously.
|
||||
int currentReportedTick = c.server().getTickCount() - 1;
|
||||
List<Value> ticks = new ArrayList<>(100);
|
||||
long[] tickArray = c.server().tickTimes;
|
||||
long[] tickArray = c.server().getTickTimesNanos();
|
||||
for (int i = currentReportedTick + 100; i > currentReportedTick; i--)
|
||||
{
|
||||
ticks.add(new NumericValue((tickArray[i % 100]) / 1000000.0));
|
||||
|
||||
Reference in new issue
Block a user