diff --git a/com/gamingmesh/jobs/Jobs.java b/com/gamingmesh/jobs/Jobs.java index 9a1a676a..19f45d83 100644 --- a/com/gamingmesh/jobs/Jobs.java +++ b/com/gamingmesh/jobs/Jobs.java @@ -812,9 +812,7 @@ public class Jobs { } } } else { - for (JobProgression prog : progression) { - int level = prog.getLevel(); JobInfo jobinfo = prog.getJob().getJobInfo(info, level); diff --git a/com/gamingmesh/jobs/PlayerManager.java b/com/gamingmesh/jobs/PlayerManager.java index 45683f18..599ee2c0 100644 --- a/com/gamingmesh/jobs/PlayerManager.java +++ b/com/gamingmesh/jobs/PlayerManager.java @@ -308,20 +308,10 @@ public class PlayerManager { * @param jPlayer */ public void leaveAllJobs(JobsPlayer jPlayer) { -// synchronized (jPlayer.saveLock) { for (JobProgression job : jPlayer.getJobProgression()) { - Jobs.getJobsDAO().quitJob(jPlayer, job.getJob()); - Jobs.getJobsDAO().recordToArchive(jPlayer, job.getJob()); - PerformCommands.PerformCommandsOnLeave(jPlayer, job.getJob()); - Jobs.leaveSlot(job.getJob()); - - Jobs.getSignUtil().SignUpdate(job.getJob().getName()); - Jobs.getSignUtil().SignUpdate("gtoplist"); - job.getJob().updateTotalPlayers(); + leaveJob(jPlayer, job.getJob()); } - jPlayer.leaveAllJobs(); -// } } /**