Fix NPE when given invalid material ids

EngineHub · Aug 9, 2018 · a81a659 · a81a659
1 parent 02ce140
commit a81a659
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCLegacyMaterial.java b/src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCLegacyMaterial.java
@@ -511,6 +511,9 @@ public static Material getMaterial(String type, int data) {
 	}
 
 	public static Material getMaterial(Material legacymat, int data) {
+		if(legacymat == null) {
+			return null;
+		}
 		if(legacymat.getMaxDurability() == 0) {
 			return Bukkit.getUnsafe().fromLegacy(new MaterialData(legacymat, (byte) data));
 		} else {