Bug fixes

Author: bensku

src/main/java/ch/njol/skript/SkriptEventHandler.java

@@ -199,6 +199,10 @@ public static void logTriggerEnd(final Trigger t) {
 		Skript.info("# " + t.getName() + " took " + 1. * (System.nanoTime() - startTrigger) / 1000000. + " milliseconds");
 	}
 
+	public static void removeTiming() {
+		timing = null;
+	}
+	
 	static void addTrigger(final Class<? extends Event>[] events, final Trigger trigger) {
 		for (final Class<? extends Event> e : events) {
 			List<Trigger> ts = triggers.get(e);

src/main/java/ch/njol/skript/bukkitutil/BiomeMappings.java

@@ -62,7 +62,7 @@ enum To19Mapping {
 		TAIGA_HILLS(Biome.TAIGA_HILLS),
 		SMALL_MOUNTAINS(Biome.SMALLER_EXTREME_HILLS),
 		JUNGLE(Biome.JUNGLE),
-		JUNGLE_HILLS(Biome.MUTATED_JUNGLE),
+		JUNGLE_HILLS(Biome.JUNGLE_HILLS),
 		JUNGLE_EDGE(Biome.JUNGLE_EDGE),
 		DEEP_OCEAN(Biome.DEEP_OCEAN),
 		STONE_BEACH(Biome.STONE_BEACH),
@@ -73,7 +73,7 @@ enum To19Mapping {
 		COLD_TAIGA(Biome.TAIGA_COLD),
 		COLD_TAIGA_HILLS(Biome.TAIGA_COLD_HILLS),
 		MEGA_TAIGA(Biome.REDWOOD_TAIGA),
-		META_TAIGA_HILLS(Biome.REDWOOD_TAIGA_HILLS),
+		MEGA_TAIGA_HILLS(Biome.REDWOOD_TAIGA_HILLS),
 		EXTREME_HILLS_PLUS(Biome.EXTREME_HILLS_WITH_TREES),
 		SAVANNA(Biome.SAVANNA),
 		SAVANNA_PLATEAU(Biome.SAVANNA_ROCK),
@@ -92,11 +92,11 @@ enum To19Mapping {
 		SAVANNA_MOUNTAINS(Biome.MUTATED_SAVANNA),
 		SAVANNA_PLATEAU_MOUNTAINS(Biome.MUTATED_SAVANNA_ROCK),
 		MESA_BRYCE(Biome.MUTATED_MESA),
-		MESA_PLATEAU_FOREST_MOUNTAINS(Biome.MESA_ROCK),
-		MESA_PLATEAU_MOUNTAINS(Biome.MESA_CLEAR_ROCK),
+		MESA_PLATEAU_FOREST_MOUNTAINS(Biome.MUTATED_MESA_ROCK),
+		MESA_PLATEAU_MOUNTAINS(Biome.MUTATED_MESA_CLEAR_ROCK),
 		BIRCH_FOREST_MOUNTAINS(Biome.MUTATED_BIRCH_FOREST),
 		BIRCH_FOREST_HILLS_MOUNTAINS(Biome.MUTATED_BIRCH_FOREST_HILLS),
-		ROOFED_FOREST_HILLS(Biome.MUTATED_ROOFED_FOREST),
+		ROOFED_FOREST_MOUNTAINS(Biome.MUTATED_ROOFED_FOREST),
 		MEGA_SPRUCE_TAIGA(Biome.MUTATED_REDWOOD_TAIGA),
 		EXTREME_HILLS_MOUNTAINS(Biome.MUTATED_EXTREME_HILLS),
 		EXTREME_HILLS_PLUS_MOUNTAINS(Biome.MUTATED_EXTREME_HILLS_WITH_TREES),

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

@@ -822,6 +822,7 @@ public String getVariableNamePattern() {
 				.usage(BiomeUtils.getAllNames())
 				.examples("biome at the player is desert")
 				.since("1.4.4")
+				.after("damagecause")
 				.parser(new Parser<Biome>() {
 					@Override
 					@Nullable

src/main/java/ch/njol/skript/timings/Timings.java

@@ -26,6 +26,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
+import ch.njol.skript.SkriptEventHandler;
+
 /**
  * Static utils for Skript timings.
  */
@@ -63,6 +65,7 @@ public static void enable() {
 	public static void disable() {
 		enabled = false;
 		disableTime = System.nanoTime();
+		SkriptEventHandler.removeTiming();
 	}
 
 	public static void clear() {

src/main/resources/lang/english.lang

@@ -321,7 +321,7 @@ biomes:
 	cold_taiga_mountains: cold taiga mountains
 	savanna_mountains: savanna mountains
 	savanna_plateau_mountains: savanna plateau mountains
-	mesa_bryce: Hoodoos, Bryce, mesa bryce, mesa (bryce)
+	mesa_bryce: bryce, mesa bryce, mesa (bryce), hoodoos
 	mesa_plateau_forest_mountains: mesa plateau forest mountains
 	mesa_plateau_mountains: mesa plateau mountains
 	birch_forest_mountains: birch forest mountains
@@ -331,7 +331,7 @@ biomes:
 	extreme_hills_mountains: extreme hills mountains
 	extreme_hills_plus_mountains: extreme hills plus mountains
 	mega_spruce_taiga_hills: mega spruce taiga hills
-	void: void biome #There is also damage cause...
+	void: void
 
 # -- Tree Types --
 tree types: