add a throwable catch for unsupported java versions, fixes #1932

DenizenScript · Feb 21, 2019 · 90e8626 · 90e8626
1 parent 4622007
commit 90e8626
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java
@@ -592,19 +592,17 @@ public static dMaterial getMaterialFrom(Material material, int data) {
         if (material == Material.AIR) {
             return AIR;
         }
-        if (material_varieties.containsKey(material)) {
-            if (material_varieties.get(material).containsKey(data)) {
-                return material_varieties.get(material).get(data);
-            }
-        }
-        if (data != 0 && NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13_R2)) {
-            // upvert old data valued materials
-            if (material.isBlock()) {
-                material = NMSHandler.getInstance().getBlockHelper().getBlockData(material, (byte) data).getMaterial();
-            }
+        if (material_varieties.containsKey(material) && material_varieties.get(material).containsKey(data)) {
+            return material_varieties.get(material).get(data);
         }
-        // Forcible upvert.
         if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13_R2)) {
+            if (data != 0) {
+                // upvert old data valued materials
+                if (material.isBlock()) {
+                    material = NMSHandler.getInstance().getBlockHelper().getBlockData(material, (byte) data).getMaterial();
+                }
+            }
+            // Forcible upvert from legacy
             if (material.isLegacy()) {
                 material = Bukkit.getUnsafe().fromLegacy(material);
             }

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/utilities/debugging/dB.java b/plugin/src/main/java/net/aufdemrand/denizen/utilities/debugging/dB.java
@@ -350,13 +350,21 @@ public static void log(String message) {
         if (!showDebug) {
             return;
         }
-        Class<?> caller = sun.reflect.Reflection.getCallerClass(2);
-        String callerName = classNameCache.get(caller);
-        if (callerName == null) {
-            classNameCache.put(caller, callerName = caller.getSimpleName());
+        String callerName;
+        try {
+            Class<?> caller = sun.reflect.Reflection.getCallerClass(2);
+            callerName = classNameCache.get(caller);
+            if (callerName == null) {
+                classNameCache.put(caller, callerName = caller.getSimpleName());
+            }
+            callerName = callerName.length() > 16 ? callerName.substring(0, 12) + "..." : callerName;
+        }
+        catch (Throwable ex) {
+            // Intentionally ignore throwable.
+            callerName = "(Java version unsupported)";
         }
         ConsoleSender.sendMessage(ChatColor.YELLOW + "+> ["
-                + (callerName.length() > 16 ? callerName.substring(0, 12) + "..." : callerName) + "] "
+                + callerName + "] "
                 + ChatColor.WHITE + trimMessage(message));
     }