Merge branch 'master' into 1.15

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.6.4+build.169
 
 # Mod Properties
-	mod_version = 1.2.3+v191113
+	mod_version = 1.2.3+v191114
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 

src/main/java/carpet/settings/CarpetSettings.java

@@ -28,7 +28,7 @@ import static carpet.settings.RuleCategory.TNT;
 
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.2.3+v191113";
+    public static final String carpetVersion = "1.2.3+v191114";
     public static final Logger LOG = LogManager.getLogger();
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;

src/main/java/carpet/utils/CarpetProfiler.java

@@ -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)
     {
         return String.format("%s.%s%s",
@@ -136,7 +131,7 @@ public class CarpetProfiler
 
     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;
         long end_time = System.nanoTime();
         if (tok.type == TYPE.GENERAL)
@@ -154,7 +149,7 @@ public class CarpetProfiler
 
     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;
         long end_time = System.nanoTime();
         String section;