Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Increased PlayerData#boundSkills security

Browse Source
This commit is contained in:
Indyuce 2022-02-19 13:09:30 +01:00
parent 3b09398ebc
commit 06f1ab2ab0
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
View File

@ -156,7 +156,7 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
int j = 0; int j = 0;
while (j < boundSkills.size()) while (j < boundSkills.size())
try { try {
boundSkills.set(j, getProfess().getSkill(boundSkills.get(j).getSkill())); boundSkills.set(j, Objects.requireNonNull(getProfess().getSkill(boundSkills.get(j).getSkill())));
} catch (Exception ignored) { } catch (Exception ignored) {
} finally { } finally {
j++; j++;
@ -843,6 +843,7 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
} }
public void setBoundSkill(int slot, ClassSkill skill) { public void setBoundSkill(int slot, ClassSkill skill) {
Validate.notNull(skill, "Skill cannot be null");
if (boundSkills.size() < 6) if (boundSkills.size() < 6)
boundSkills.add(skill); boundSkills.add(skill);
else else

13
src/main/java/net/Indyuce/mmocore/skill/RegisteredSkill.java
View File

@ -90,4 +90,17 @@ public class RegisteredSkill {
public double getModifier(String modifier, int level) { public double getModifier(String modifier, int level) {
return defaultModifiers.get(modifier).calculate(level); return defaultModifiers.get(modifier).calculate(level);
} }
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
RegisteredSkill that = (RegisteredSkill) o;
return handler.equals(that.handler) && triggerType.equals(that.triggerType);
}
@Override
public int hashCode() {
return Objects.hash(handler, triggerType);
}
} }