Handle exception when block displays are given bad blockdata format

EngineHub · Mar 26, 2024 · 65f154d · 65f154d
1 parent a67b83d
commit 65f154d
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/java/com/laytonsmith/core/functions/EntityManagement.java b/src/main/java/com/laytonsmith/core/functions/EntityManagement.java
@@ -2805,10 +2805,14 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 							case entity_spec.KEY_DISPLAY_BLOCK:
 								MCBlockData bd;
 								Mixed m = specArray.get(index, t);
-								if(m.isInstanceOf(CArray.TYPE)) {
-									bd = ObjectGenerator.GetGenerator().blockData((CArray) m, t);
-								} else {
-									bd = Static.getServer().createBlockData(m.val());
+								try {
+									if(m.isInstanceOf(CArray.TYPE)) {
+										bd = ObjectGenerator.GetGenerator().blockData((CArray) m, t);
+									} else {
+										bd = Static.getServer().createBlockData(m.val().toLowerCase());
+									}
+								} catch(IllegalArgumentException ex) {
+									throw new CREFormatException("Cannot create block data from: " + m.val(), t);
 								}
 								bDisplay.setBlockData(bd);
 								break;