things

src/main/java/com/gamingmesh/jobs/CMILib/ActionBarManager.java

@@ -39,8 +39,7 @@ public class ActionBarManager {
 		    consts = ChatMessageclz.getEnumConstants();
 		    sub = consts[2].getClass();
 		}
-	    } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | NoSuchFieldException ex) {
+	    } catch (Exception ex) {
-		Bukkit.getConsoleSender().sendMessage("Error {0} ");
 		Bukkit.getConsoleSender().sendMessage(ex.toString());
 	    }
 	}
@@ -54,11 +53,7 @@ public class ActionBarManager {
     }
 
     public static void send(Player receivingPacket, String msg) {
-	if (receivingPacket == null)
+	if (receivingPacket == null || !receivingPacket.isOnline() || msg == null)
-	    return;
-	if (!receivingPacket.isOnline())
-	    return;
-	if (msg == null)
 	    return;
 
 	try {

src/main/java/com/gamingmesh/jobs/CMILib/CMIColors.java

@@ -1,99 +0,0 @@
-package com.gamingmesh.jobs.CMILib;
-
-import java.awt.Color;
-
-public enum CMIColors {
-    White(0, "White", CMIMaterial.BONE_MEAL, new Color(249, 255, 254)),
-    Orange(1, "Orange", CMIMaterial.ORANGE_DYE, new Color(249, 128, 29)),
-    Magenta(2, "Magenta", CMIMaterial.MAGENTA_DYE, new Color(199, 78, 189)),
-    Navy(3, "Navy", CMIMaterial.LIGHT_BLUE_DYE, new Color(58, 179, 218)),
-    Yellow(4, "Yellow", CMIMaterial.DANDELION_YELLOW, new Color(254, 216, 61)),
-    Lime(5, "Lime", CMIMaterial.LIME_DYE, new Color(128, 199, 31)),
-    Pink(6, "Pink", CMIMaterial.PINK_DYE, new Color(243, 139, 170)),
-    Gray(7, "Gray", CMIMaterial.GRAY_DYE, new Color(71, 79, 82)),
-    Silver(8, "Silver", CMIMaterial.LIGHT_GRAY_DYE, new Color(157, 157, 151)),
-    Cyan(9, "Cyan", CMIMaterial.CYAN_DYE, new Color(22, 156, 156)),
-    Purple(10, "Purple", CMIMaterial.PURPLE_DYE, new Color(137, 50, 184)),
-    Blue(11, "Blue", CMIMaterial.LAPIS_LAZULI, new Color(60, 68, 170)),
-    Brown(12, "Brown", CMIMaterial.COCOA_BEANS, new Color(131, 84, 50)),
-    Green(13, "Green", CMIMaterial.CACTUS_GREEN, new Color(94, 124, 22)),
-    Red(14, "Red", CMIMaterial.ROSE_RED, new Color(176, 46, 38)),
-    Black(15, "Black", CMIMaterial.INK_SAC, new Color(29, 29, 33));
-
-    private int id;
-    private String name;
-    private CMIMaterial mat;
-    private Color color;
-
-    CMIColors(int id, String name, CMIMaterial mat, Color color) {
-	this.id = id;
-	this.name = name;
-	this.mat = mat;
-	this.color = color;
-    }
-
-    CMIColors(int id, String name, CMIMaterial mat) {
-	this.id = id;
-	this.name = name;
-	this.mat = mat;
-    }
-
-    public int getId() {
-	return id;
-    }
-
-    public String getName() {
-	return name;
-    }
-
-    public static CMIColors getById(int id) {
-	for (CMIColors one : CMIColors.values()) {
-	    if (one.getId() == id)
-		return one;
-	}
-	return CMIColors.White;
-    }
-
-    public CMIMaterial getMat() {
-	return mat;
-    }
-
-    public void setMat(CMIMaterial mat) {
-	this.mat = mat;
-    }
-
-    public static CMIMaterial getColorMaterial(CMIMaterial mat) {
-	String name = mat.getName().replace(" ", "").replace("_", "").toLowerCase();
-	for (CMIColors one : values()) {
-	    if (name.contains(one.getName().replace("_", "").toLowerCase()))
-		return one.getMat();
-	}
-
-	return null;
-    }
-
-    public static CMIColors getColor(CMIMaterial mat) {
-	String name = mat.getName().replace(" ", "").replace("_", "").toLowerCase();
-	for (CMIColors one : values()) {
-	    if (name.contains(one.getName().replace("_", "").toLowerCase()))
-		return one;
-	}
-
-//		if (c == null) {
-//	    try {
-//		net.minecraft.server.v1_13_R2.BlockPosition blockPosition = new net.minecraft.server.v1_13_R2.BlockPosition(b.getX(), b.getY(), b.getZ());
-//		net.minecraft.server.v1_13_R2.WorldServer worldServer = ((org.bukkit.craftbukkit.v1_13_R2.CraftWorld) b.getWorld()).getHandle();
-//		IBlockData t = worldServer.getType(blockPosition);
-//		net.minecraft.server.v1_13_R2.Block bl = t.getBlock();
-//		c = new Color(bl.n(t).i().rgb, true);
-//	    } catch (Exception | Error e) {
-//	    }
-//	}
-
-	return null;
-    }
-
-    public Color getColor() {
-	return color;
-    }
-}

src/main/java/com/gamingmesh/jobs/CMILib/CMIMaterial.java

@@ -2562,7 +2562,7 @@ public enum CMIMaterial {
 	return false;
     }
 
-    @SuppressWarnings("deprecation")
+	@SuppressWarnings("deprecation")
 	public static CMISlabType getSlabType(Block block) {
 	if (!isSlab(block.getType()))
 	    return CMISlabType.NOTSLAB;

src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java

@@ -653,19 +653,18 @@ public abstract class JobsDAO {
 	    res = prest.executeQuery();
 	    while (res.next()) {
 		int id = res.getInt(JobsTableFields.userid.getCollumn());
-		String jobName = res.getString(JobsTableFields.job.getCollumn());
 		List<JobsDAOData> ls = map.get(id);
 		if (ls == null)
 		    ls = new ArrayList<>();
 
 		int jobId = res.getInt(JobsTableFields.jobid.getCollumn());
 		if (jobId == 0) {
-		    ls.add(new JobsDAOData(jobName, res.getInt(JobsTableFields.level.getCollumn()), res.getDouble(JobsTableFields.experience.getCollumn())));
+		    ls.add(new JobsDAOData(res.getString(JobsTableFields.job.getCollumn()), res.getInt(JobsTableFields.level.getCollumn()), res.getDouble(JobsTableFields.experience.getCollumn())));
 		    converted = false;
 		} else {
 		    // This should be removed when we switch over to id only method
 		    if (converted)
-			if (jobName == null || jobName.isEmpty())
+			if (res.getString(JobsTableFields.job.getCollumn()) == null || res.getString(JobsTableFields.job.getCollumn()).isEmpty())
 			    converted = false;
 
 		    Job job = Jobs.getJob(jobId);