icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tighten up profiler client support

Browse Source
This commit is contained in:
gnembon committed 2019-11-14 23:18:07 -04:00
1 parent 12e6ef627f
commit 5e276c6115
1 file changed
+2 -7
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/utils/CarpetProfiler.java
+2 -7
View File
@@ -53,11 +53,6 @@ public class CarpetProfiler
} }
} }
private static String getWorldString(World world)
{
return world.getDimension().getType().toString().replaceFirst("minecraft:", "") + (world.isClient ? "(Client)" : "");
}
private static String getSectionString(World world, String section) private static String getSectionString(World world, String section)
{ {
return String.format("%s.%s%s", return String.format("%s.%s%s",
@@ -136,7 +131,7 @@ public class CarpetProfiler
public static void end_current_section(ProfilerToken tok) public static void end_current_section(ProfilerToken tok)
{ {
if (tick_health_requested == 0L || test_type != TYPE.GENERAL || current_tick_start == 0) if (tick_health_requested == 0L || test_type != TYPE.GENERAL || current_tick_start == 0 || tok == null)
return; return;
long end_time = System.nanoTime(); long end_time = System.nanoTime();
if (tok.type == TYPE.GENERAL) if (tok.type == TYPE.GENERAL)
@@ -154,7 +149,7 @@ public class CarpetProfiler
public static void end_current_entity_section(ProfilerToken tok) public static void end_current_entity_section(ProfilerToken tok)
{ {
if (tick_health_requested == 0L || test_type != TYPE.ENTITY || current_tick_start == 0) if (tick_health_requested == 0L || test_type != TYPE.ENTITY || current_tick_start == 0 || tok == null)
return; return;
long end_time = System.nanoTime(); long end_time = System.nanoTime();
String section; String section;