From 3fceed1beb78ebdae571cc2cfd9b21889acc5f5a Mon Sep 17 00:00:00 2001
From: montlikadani <montlikada@gmail.com>
Date: Tue, 14 Jul 2020 08:22:12 +0200
Subject: [PATCH] Add \n newline support for jobs description

---
 src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java       | 2 +-
 src/main/java/com/gamingmesh/jobs/Jobs.java                 | 1 -
 .../com/gamingmesh/jobs/config/GeneralConfigManager.java    | 6 +-----
 src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java          | 4 +---
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java b/src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java
index 9701ebb8..1df67a82 100644
--- a/src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java
+++ b/src/main/java/com/gamingmesh/jobs/Gui/GuiManager.java
@@ -100,7 +100,7 @@ public class GuiManager {
 		else
 		    Lore.add(Jobs.getLanguage().getMessage("command.browse.output.bonus", "[amount]", (int) (job.getBonus() * 100)));
 
-	    Lore.addAll(Arrays.asList(job.getDescription().split("/n")));
+	    Lore.addAll(Arrays.asList(job.getDescription().contains("/n") ? job.getDescription().split("/n") : job.getDescription().split("\n")));
 
 	    if (job.getMaxSlots() != null)
 		Lore.add(Jobs.getLanguage().getMessage("command.info.gui.leftSlots") + ((job.getMaxSlots() - Jobs.getUsedSlots(job)) > 0 ? (job.getMaxSlots() - Jobs
diff --git a/src/main/java/com/gamingmesh/jobs/Jobs.java b/src/main/java/com/gamingmesh/jobs/Jobs.java
index 92d5a2bb..a0973aa9 100644
--- a/src/main/java/com/gamingmesh/jobs/Jobs.java
+++ b/src/main/java/com/gamingmesh/jobs/Jobs.java
@@ -1134,7 +1134,6 @@ public class Jobs extends JavaPlugin {
 	    }
 
 	    expiredJobs.forEach(j -> getPlayerManager().leaveJob(jPlayer, j));
-	    expiredJobs.clear();
 	}
     }
 
diff --git a/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java
index b81404dc..6e7fa638 100644
--- a/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java
+++ b/src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java
@@ -95,7 +95,7 @@ public class GeneralConfigManager {
 	CancelCowMilking, fixAtMaxLevel, TitleChangeChat, TitleChangeActionBar, LevelChangeChat,
 	LevelChangeActionBar, SoundLevelupUse, SoundTitleChangeUse, UseServerAccount, EmptyServerAccountChat,
 	EmptyServerAccountActionBar, ActionBarsMessageByDefault, ShowTotalWorkers, ShowPenaltyBonus, useDynamicPayment,
-	JobsGUIOpenOnBrowse, JobsGUIShowChatBrowse, JobsGUISwitcheButtons, UseInversedClickToLeave, ShowActionNames,
+	JobsGUIOpenOnBrowse, JobsGUIShowChatBrowse, JobsGUISwitcheButtons, ShowActionNames,
 	DisableJoiningJobThroughGui, FireworkLevelupUse, UseRandom, UseFlicker, UseTrail, UsePerPermissionForLeaving,
 	EnableConfirmation, FilterHiddenPlayerFromTabComplete, jobsInfoOpensBrowse, MonsterDamageUse = false, useMaxPaymentCurve,
 	hideJobsInfoWithoutPermission, UseTaxes, TransferToServerAccount, TakeFromPlayersPayment, AutoJobJoinUse, AllowDelevel,
@@ -944,10 +944,6 @@ public class GeneralConfigManager {
 	c.addComment("JobsGUI.SwitcheButtons", "With true left mouse button will join job and right will show more info.",
 	    "With false left mouse button will show more info, right will join job or inversely.", "Don't forget to adjust locale file!");
 	JobsGUISwitcheButtons = c.get("JobsGUI.SwitcheButtons", false);
-	c.addComment("JobsGUI.UseInversedClickToLeave", "Do you want to use the left/right click button to leave from job?",
-	    "This option click type depend from SwitcheButtons option, if true using the left button and inversely.",
-	    "Don't forget to adjust locale file");
-	UseInversedClickToLeave = c.get("JobsGUI.UseInversedClickToLeave", false);
 	c.addComment("JobsGUI.DisableJoiningJobThroughGui", "Allows players to join a specified job via GUI.");
 	DisableJoiningJobThroughGui = c.get("JobsGUI.DisableJoiningJobThroughGui", false);
 	c.addComment("JobsGUI.ShowActionNames", "Do you want to show the action names in GUI?");
diff --git a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java
index 8fd0bbe4..bc9557dc 100644
--- a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java
+++ b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java
@@ -1707,7 +1707,7 @@ public abstract class JobsDAO {
 	    prest = conn.prepareStatement("SELECT * FROM `" + DBTables.UsersTable.getTableName() + "` WHERE `" + UserTableFields.player_uuid.getCollumn() + "` = ?;");
 	    prest.setString(1, uuid.toString());
 	    res = prest.executeQuery();
-	    if (res.next()) {
+	    while (res.next()) {
 		pInfo = new PlayerInfo(
 		    res.getString(UserTableFields.username.getCollumn()),
 		    res.getInt("id"), uuid,
@@ -1763,8 +1763,6 @@ public abstract class JobsDAO {
 		ps.execute();
 		close(ps);
 	    }
-
-	    uuids.clear();
 	} catch (SQLException e) {
 	    e.printStackTrace();
 	} finally {