Entity type recognition fix

src/main/java/com/gamingmesh/jobs/config/ConfigManager.java

@@ -32,6 +32,7 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 
@@ -812,7 +813,7 @@ public class ConfigManager {
             Jobs.getExploreManager().setPlayerAmount(amount);
 
             Jobs.getChunkExplorationManager().setExploreEnabled();
-	    Jobs.getChunkExplorationManager().setPlayerAmount(amount);
+            Jobs.getChunkExplorationManager().setPlayerAmount(amount);
 
         } else if (actionType == ActionType.CRAFT) {
             if (myKey.startsWith("!")) {
@@ -843,8 +844,8 @@ public class ConfigManager {
 
             CMIEntityType entity = CMIEntityType.get(type);
             if (entity != null) {
-		type = entity.toString();
-	    }
+                type = entity.toString();
+            }
 
         }
 

src/main/java/com/gamingmesh/jobs/stuff/Util.java

@@ -39,6 +39,7 @@ import com.gamingmesh.jobs.actions.EnchantActionInfo;
 import com.gamingmesh.jobs.container.JobsWorld;
 
 import net.Zrips.CMILib.Enchants.CMIEnchantment;
+import net.Zrips.CMILib.Entities.CMIEntityType;
 import net.Zrips.CMILib.Items.CMIMaterial;
 import net.Zrips.CMILib.Version.Version;
 
@@ -88,6 +89,9 @@ public final class Util {
 
     public static String getRealType(Entity entity) {
         if (Version.isCurrentEqualOrHigher(Version.v1_11_R1)) {
+            CMIEntityType ctype = CMIEntityType.get(entity);
+            if (ctype != null)
+                return ctype.toString();
             return entity.getType().name();
         }
 

src/main/java/com/gamingmesh/jobs/stuff/blockLoc.java

@@ -5,106 +5,112 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 
+import net.Zrips.CMILib.Container.CMIWorld;
+
 public class blockLoc {
     private int x;
     private int y;
     private int z;
     private World w;
+    private String worldName = null;
     private boolean disabled = false;
 
     public blockLoc(String loc) {
-	fromString(loc);
+        fromString(loc);
     }
 
     public blockLoc(Location loc) {
-	x = loc.getBlockX();
-	y = loc.getBlockY();
-	z = loc.getBlockZ();
-	w = loc.getWorld();
+        x = loc.getBlockX();
+        y = loc.getBlockY();
+        z = loc.getBlockZ();
+        w = loc.getWorld();
     }
 
     public String getWorldName() {
-	return w != null ? w.getName() : "__";
+        return w != null ? w.getName() : worldName != null ? worldName : "__";
     }
 
     public void setX(int x) {
-	this.x = x;
+        this.x = x;
     }
 
     public void setY(int y) {
-	this.y = y;
+        this.y = y;
     }
 
     public void setZ(int z) {
-	this.z = z;
+        this.z = z;
     }
 
     @Override
     public String toString() {
-	return (w == null ? getWorldName() : w.getName()) + ":" + x + ":" + y + ":" + z;
+        return getWorldName() + ":" + x + ":" + y + ":" + z;
     }
 
     public String toVectorString() {
-	return  x + ":" + y + ":" + z;
+        return x + ":" + y + ":" + z;
     }
 
     public boolean fromString(String loc) {
-	String[] split = loc.split(":", 4);
-	if (split.length == 0) {
-	    return false;
-	}
+        String[] split = loc.split(":", 4);
+        if (split.length == 0) {
+            return false;
+        }
 
-	World w = Bukkit.getWorld(split[0]);
-	if (w == null)
-	    return false;
-	this.w = w;
+        World w = CMIWorld.getWorld(split[0]);
+        if (w != null)
+            this.w = w;
+        else
+            this.worldName = split[0];
 
-	if (split.length < 4) {
-	    return false;
-	}
+        if (split.length < 4) {
+            return false;
+        }
 
-	try {
-	    x = Integer.parseInt(split[1]);
-	    y = Integer.parseInt(split[2]);
-	    z = Integer.parseInt(split[3]);
-	    return true;
-	} catch (NumberFormatException e) {
-	    return false;
-	}
+        try {
+            x = Integer.parseInt(split[1]);
+            y = Integer.parseInt(split[2]);
+            z = Integer.parseInt(split[3]);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
     }
 
     public Block getBlock() {
-	Location loc = getLocation();
-	return loc == null ? null : loc.getBlock();
+        Location loc = getLocation();
+        return loc == null ? null : loc.getBlock();
     }
 
     public Location getLocation() {
-	if (getWorldName() == null && w == null)
-	    return null;
+        if (getWorldName() == null && w == null)
+            return null;
 
-	// Make sure cached world is loaded
-	World w = this.w == null ? Bukkit.getWorld(getWorldName()) : Bukkit.getWorld(this.w.getName());
-	if (w == null)
-	    return null;
+        // Make sure cached world is loaded
+        World w = this.w == null ? Bukkit.getWorld(getWorldName()) : Bukkit.getWorld(this.w.getName());
+        if (w == null)
+            return null;
 
-	this.w = w;
+        this.w = w;
 
-	return new Location(w, x, y, z);
+        return new Location(w, x, y, z);
     }
 
     public boolean isDisabled() {
-	return disabled;
+        return disabled;
     }
 
     public void setDisabled(boolean disabled) {
-	this.disabled = disabled;
+        this.disabled = disabled;
     }
 
     public World getWorld() {
-	return w;
+        if (w == null && worldName != null)
+            w = CMIWorld.getWorld(worldName);
+        return w;
     }
 
     public void setWorld(World world) {
-	this.w = world;
+        this.w = world;
     }
 }