Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-12-01 15:03:36 +01:00
Code Issues Projects Releases Wiki Activity

Cleaning up duplicated jobs records

Browse Source
This commit is contained in:
Zrips 2021-07-19 13:02:48 +03:00
parent 8fb7cd2edf
commit 48de4cb285
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gamingmesh/jobs/PlayerManager.java
View File

@ -444,7 +444,7 @@ public class PlayerManager {
// Fixing issue with doubled jobs. Picking bigger job by level or exp
JobProgression oldProg = jPlayer.getJobProgression(job);
if (oldProg != null && (oldProg.getLevel() > jobdata.getLevel() || oldProg.getLevel() == jobdata.getLevel() && oldProg.getExperience() > jobdata.getExperience())) {
Jobs.getDBManager().getDB().removeSpecificJob(jPlayer, jobdata.getJobName(), jobdata.getLevel());
Jobs.getDBManager().getDB().removeSpecificJob(jPlayer.getUserId(), job.getName(), job.getJobFullName(), jobdata.getLevel(), jobdata.getExperience());
CMIMessages.consoleMessage("Cleaned up duplicated jobs record for " + jPlayer.getName() + " Job:" + jobdata.getJobName() + " Level:" + jobdata.getLevel());
continue;
}
@ -455,7 +455,7 @@ public class PlayerManager {
}
}
}
if (points != null)
jPlayer.setPoints(points);

17
src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java
View File

@ -1590,22 +1590,23 @@ public abstract class JobsDAO {
}
/**
* Quit a job (delete player-job entry from storage)
* @param player - player that wishes to quit the job
* @param job - job that the player wishes to quit
* Remove duplicated job by specific criteria
*/
public synchronized boolean removeSpecificJob(JobsPlayer jPlayer, String jobName, int level) {
public synchronized boolean removeSpecificJob(int userId, String jobName, String legacyName, int level, double exp) {
JobsConnection conn = getConnection();
if (conn == null)
return false;
PreparedStatement prest = null;
boolean done = true;
try {
prest = conn.prepareStatement("DELETE FROM `" + getJobsTableName() + "` WHERE `" + JobsTableFields.userid.getCollumn() + "` = ? AND `" + JobsTableFields.job.getCollumn()
+ "` = ? AND `" + JobsTableFields.level.getCollumn() + "` = ?;");
prest.setInt(1, jPlayer.getUserId());
prest = conn.prepareStatement("DELETE FROM `" + getJobsTableName() + "` WHERE `" + JobsTableFields.userid.getCollumn() + "` = ? AND (`" + JobsTableFields.job.getCollumn()
+ "` = ? OR `" + JobsTableFields.job.getCollumn()
+ "` = ?) AND `" + JobsTableFields.level.getCollumn() + "` = ? AND `" + JobsTableFields.experience.getCollumn() + "` = ?;");
prest.setInt(1, userId);
prest.setString(2, jobName);
prest.setInt(3, level);
prest.setString(3, legacyName);
prest.setInt(4, level);
prest.setDouble(5, exp);
prest.execute();
} catch (SQLException e) {
e.printStackTrace();