Merge branch 'master' of https://github.com/Zrips/Jobs.git

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

@@ -97,7 +97,7 @@ public class ActionBarTitleMessages {
 	    Object player = getHandle.invoke(receivingPacket);
 	    Object connection = playerConnection.get(player);
 	    sendPacket.invoke(connection, packet);
-	} catch (Exception ex) {
+	} catch (Throwable t) {
 //	    Bukkit.getLogger().log(Level.SEVERE, "Error {0}", ex);
 	}
 
@@ -105,7 +105,7 @@ public class ActionBarTitleMessages {
 	    Object player = getHandle.invoke(receivingPacket);
 	    Object connection = playerConnection.get(player);
 	    sendPacket.invoke(connection, packet);
-	} catch (Exception ex) {
+	} catch (Throwable t) {
 //	    Bukkit.getLogger().log(Level.SEVERE, "Error {0}", ex);
 	}
     }

src/main/java/com/gamingmesh/jobs/Jobs.java

@@ -181,15 +181,11 @@ public class Jobs extends JavaPlugin {
 
     @Deprecated
     public static McMMOManager getMcMMOlistener() {
-	if (McMMOManager == null)
+	return McMMOManager == null ? new McMMOManager() : McMMOManager;
-	    McMMOManager = new McMMOManager();
-	return McMMOManager;
     }
 
     public static McMMOManager getMcMMOManager() {
-	if (McMMOManager == null)
+	return McMMOManager == null ? new McMMOManager() : McMMOManager;
-	    McMMOManager = new McMMOManager();
-	return McMMOManager;
     }
 
     public void setPistonProtectionListener() {
@@ -212,9 +208,7 @@ public class Jobs extends JavaPlugin {
     private boolean PlaceholderAPIEnabled = false;
 
     public Placeholder getPlaceholderAPIManager() {
-	if (Placeholder == null)
+	return Placeholder == null ? new Placeholder(this) : Placeholder;
-	    Placeholder = new Placeholder(this);
-	return Placeholder;
     }
 
     private boolean setupPlaceHolderAPI() {
@@ -275,15 +269,11 @@ public class Jobs extends JavaPlugin {
     }
 
     public static Reflections getReflections() {
-	if (reflections == null)
+	return reflections == null ? new Reflections() : reflections;
-	    reflections = new Reflections();
-	return reflections;
     }
 
     public static JobsManager getDBManager() {
-	if (DBManager == null)
+	return DBManager == null ? new JobsManager(instance) : DBManager;
-	    DBManager = new JobsManager(instance);
-	return DBManager;
     }
 
     public static void setShopManager() {
@@ -315,7 +305,7 @@ public class Jobs extends JavaPlugin {
     }
 
     public static ActionBarTitleMessages getActionBar() {
-	return actionbar;
+	return actionbar == null ? new ActionBarTitleMessages() : actionbar;
     }
 
     public static void setNms(NMS nms) {
@@ -429,9 +419,7 @@ public class Jobs extends JavaPlugin {
      * @return the scoreboard manager
      */
     public CMIScoreboardManager getCMIScoreboardManager() {
-	if (CMIScoreboardManager == null)
+	return CMIScoreboardManager == null ? new CMIScoreboardManager(this) : CMIScoreboardManager;
-	    CMIScoreboardManager = new CMIScoreboardManager(this);
-	return CMIScoreboardManager;
     }
 
     protected static Jobs instance;
@@ -779,6 +767,13 @@ public class Jobs extends JavaPlugin {
 	instance = this;
 	setEnabled(true);
 
+	if (instance == null) {
+	    System.out.println("Plugin instance is null. Plugin will be disabled.");
+	    System.out.println("Try restart your server completely. If this not work contact the developers.");
+	    setEnabled(false);
+	    return;
+	}
+
 	versionCheckManager = new VersionChecker(this);
 
 	ItemManager.load();
@@ -814,7 +809,6 @@ public class Jobs extends JavaPlugin {
 
 	try {
 
-	    setActionBar();
 	    YmlMaker jobConfig = new YmlMaker(this, "jobConfig.yml");
 	    jobConfig.saveDefaultConfig();
 
@@ -839,6 +833,7 @@ public class Jobs extends JavaPlugin {
 	    setConfigManager();
 	    setCommandManager();
 	    setBpManager();
+	    setActionBar();
 
 	    getCommand("jobs").setExecutor(cManager);
 	    this.getCommand("jobs").setTabCompleter(new TabComplete());
@@ -889,6 +884,8 @@ public class Jobs extends JavaPlugin {
 
     @Override
     public void onDisable() {
+	if (instance == null) return;
+
 	try {
 	    GUIManager.CloseInventories();
 	    shopManager.CloseInventories();

src/main/java/com/gamingmesh/jobs/Signs/SignUtil.java

@@ -113,9 +113,9 @@ public class SignUtil {
 	if (JobName.contains("gtoplist"))
 	    PlayerList = Jobs.getJobsDAO().getGlobalTopList(0);
 
-	HashMap<String, List<TopList>> temp = new HashMap<String, List<TopList>>();
+	HashMap<String, List<TopList>> temp = new HashMap<>();
 
-	for (com.gamingmesh.jobs.Signs.Sign one : new ArrayList<>(Signs.GetAllSigns())) {
+	for (com.gamingmesh.jobs.Signs.Sign one : new ArrayList<com.gamingmesh.jobs.Signs.Sign>(Signs.GetAllSigns())) {
 	    String SignJobName = one.GetJobName();
 
 	    if (!JobName.contains(SignJobName))