Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleJob

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:21:04 +02:00
parent ee503eedce
commit 3e1b5b93d5
52 changed files with 283 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/server/quest/actions/SkillAction.java
View File

@@ -22,7 +22,7 @@
package server.quest.actions;
import client.Character;
import client.MapleJob;
import client.Job;
import client.Skill;
import client.SkillFactory;
import provider.MapleData;
@@ -114,7 +114,7 @@ public class SkillAction extends MapleQuestAction {
return masterLevel;
}
public boolean jobsContains(MapleJob job) {
public boolean jobsContains(Job job) {
return jobs.contains(job.getId());
}

4
src/main/java/server/quest/requirements/JobRequirement.java
View File

@@ -22,7 +22,7 @@
package server.quest.requirements;
import client.Character;
import client.MapleJob;
import client.Job;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -58,7 +58,7 @@ public class JobRequirement extends MapleQuestRequirement {
@Override
public boolean check(Character chr, Integer npcid) {
for(Integer job : jobs) {
if (chr.getJob().equals(MapleJob.getById(job)) || chr.isGM()) {
if (chr.getJob().equals(Job.getById(job)) || chr.isGM()) {
return true;
}
}