From 34712e27f00a4c2b56644c30b822931e90d917bc Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 24 Feb 2013 18:04:20 -0600 Subject: [PATCH] Put in some protextion logic for apparently broken SpoutPlugin --- src/main/java/org/dynmap/bukkit/SpoutPluginBlocks.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/dynmap/bukkit/SpoutPluginBlocks.java b/src/main/java/org/dynmap/bukkit/SpoutPluginBlocks.java index 18dd14a4..57b6c0be 100644 --- a/src/main/java/org/dynmap/bukkit/SpoutPluginBlocks.java +++ b/src/main/java/org/dynmap/bukkit/SpoutPluginBlocks.java @@ -115,7 +115,12 @@ public class SpoutPluginBlocks { /* Loop through blocks - try to freshen files, if needed */ for(CustomBlock b : cb) { BlockDesign bd = b.getBlockDesign(); - String blkid = bd.getTexturePlugin() + "." + fixIDString(b.getName()); + if(bd == null) continue; + String txtplug = bd.getTexturePlugin(); + if(txtplug == null) continue; + String blkname = b.getName(); + if(blkname == null) continue; + String blkid = txtplug + "." + fixIDString(blkname); /* If not GenericCubiodBlockDesign, we don't handle it */ if((bd instanceof GenericCuboidBlockDesign) == false) { Log.info("Block " + blkid + " not suppored - only cubiod blocks");