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

Don't make skill level lower if they already have it (#385)

Browse Source
This commit is contained in:
MedicOP
2019-02-03 13:57:36 +01:00
committed by Ronan Lana
parent 0a7aa8b05e
commit a82cb9c719
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/scripting/AbstractPlayerInteraction.java
View File

@@ -29,6 +29,7 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import client.Skill;
import net.server.Server;
import net.server.channel.Channel;
import net.server.guild.MapleGuild;
@@ -843,7 +844,22 @@ public class AbstractPlayerInteraction {
}
public void teachSkill(int skillid, byte level, byte masterLevel, long expiration) {
getPlayer().changeSkillLevel(SkillFactory.getSkill(skillid), level, masterLevel, expiration);
teachSkill(skillid, level, masterLevel, expiration, false);
}
public void teachSkill(int skillid, byte level, byte masterLevel, long expiration, boolean force) {
Skill skill = SkillFactory.getSkill(skillid);
if (!force && level > -1) {
MapleCharacter.SkillEntry skillEntry = getPlayer().getSkills().get(skill);
if (skillEntry != null) {
getPlayer().changeSkillLevel(skill, (byte) Math.max(skillEntry.skillevel, level), Math.max(skillEntry.masterlevel, masterLevel), expiration == -1 ? -1 : Math.max(skillEntry.expiration, expiration));
return;
}
}
getPlayer().changeSkillLevel(skill, level, masterLevel, expiration);
}
public void removeEquipFromSlot(short slot) {