Merge branch 'dev/patch' into dev/ExprBlocks-Void-to-Void

SkriptLang · Oct 2, 2024 · db98d3e · db98d3e
2 parents 193f246 + ba32d7a
commit db98d3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.parallel=true
 
 groupid=ch.njol
 name=skript
-version=2.9.2
+version=2.9.3
 jarName=Skript.jar
 testEnv=java21/paper-1.21.0
 testEnvJavaVersion=21
diff --git a/src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java b/src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java
@@ -70,11 +70,7 @@ public class BukkitUnsafe {
 
 	@Nullable
 	public static Material getMaterialFromMinecraftId(String id) {
-		// On 1.13, Vanilla and Spigot names are same
-		if (id.length() > 9)
-			return Material.matchMaterial(id.substring(10)); // Strip 'minecraft:' out
-		else // Malformed material name
-			return null;
+		return Material.matchMaterial(id);
 	}
 
 	public static void modifyItemStack(ItemStack stack, String arguments) {