EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 11:03:43 +01:00
Code Issues Projects Releases Wiki Activity

Tweaks to exception throwing/catching for PlayerData

Browse Source
This commit is contained in:
nossr50
2021-03-30 11:48:34 -07:00
parent 1de9c2610b
commit ed807342cc
5 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java
View File

@@ -1339,7 +1339,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
//Build Data
return playerDataBuilder.build();
} catch (NullArgumentException e) {
} catch (Exception e) {
mcMMO.p.getLogger().severe("Critical failure when trying to construct persistent player data!");
e.printStackTrace();
return null;

3
src/main/java/com/gmail/nossr50/datatypes/player/MMODataBuilder.java
View File

@@ -5,6 +5,7 @@ import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.experience.MMOExperienceBarManager;
import com.neetgames.mcmmo.UniqueDataType;
import com.neetgames.mcmmo.exceptions.UnexpectedValueException;
import com.neetgames.mcmmo.skill.SkillBossBarState;
import org.apache.commons.lang.NullArgumentException;
import org.bukkit.OfflinePlayer;
@@ -59,7 +60,7 @@ public class MMODataBuilder {
return new PlayerData(playerUUID, playerName);
}
public PlayerData build() throws NullArgumentException {
public PlayerData build() throws UnexpectedValueException, NullPointerException, NullArgumentException {
if(playerUUID == null)
throw new NullArgumentException("playerUUID");

35
src/main/java/com/gmail/nossr50/datatypes/player/PlayerData.java
View File

@@ -25,7 +25,7 @@ public class PlayerData {
/* Player Stuff */
private @NotNull String playerName;
private final @Nullable UUID playerUUID;
private final @Nullable UUID playerUUID; //TODO: T&C See if this is ever actually null, and if it is maybe we shouldn't allow it to be
/* Records */
private long lastLogin;
@@ -120,7 +120,7 @@ public class PlayerData {
@NotNull Map<PrimarySkillType, SkillBossBarState> barStateMap,
int scoreboardTipsShown,
long lastLogin,
boolean leaderBoardExclusion) throws Exception {
boolean leaderBoardExclusion) throws UnexpectedValueException, NullPointerException {
/*
* Skills Data
@@ -155,18 +155,29 @@ public class PlayerData {
* @throws UnexpectedValueException when values are outside of expected norms
* @throws Exception when values are outside of expected norms
*/
private void validateRootSkillMap(Map<PrimarySkillType, ? extends Number> map) throws UnexpectedValueException, Exception {
private void validateRootSkillMap(Map<PrimarySkillType, ? extends Number> map) throws UnexpectedValueException, NullPointerException {
//TODO: Check for missing/unregistered
Validator<Number> validator = new Validator<>();
Validator<Number> positiveValidator = new Validator<>();
Validator<Number> nullValidator = new Validator<>();
validator.addRule(new PositiveIntegerRule<>());
validator.addRule(new NonNullRule<>());
positiveValidator.addRule(new PositiveIntegerRule<>());
nullValidator.addRule(new NonNullRule<>());
for(PrimarySkillType primarySkillType : PrimarySkillType.values()) {
if(primarySkillType.isChildSkill())
continue;
validator.validate(map.get(primarySkillType));
try {
positiveValidator.validate(map.get(primarySkillType));
} catch (Exception e) {
throw new UnexpectedValueException();
}
try {
nullValidator.validate(map.get(primarySkillType));
} catch (Exception e) {
throw new NullPointerException();
}
}
}
@@ -177,7 +188,7 @@ public class PlayerData {
* @throws UnexpectedValueException when values are outside of expected norms
* @throws Exception when values are outside of expected norms
*/
private void validateSuperSkillMap(Map<? extends SuperAbilityType, ? extends Number> map) throws UnexpectedValueException, Exception {
private void validateSuperSkillMap(Map<? extends SuperAbilityType, ? extends Number> map) throws UnexpectedValueException, NullPointerException {
//TODO: Check for missing/unregistered
Validator<Number> validator = new Validator<>();
@@ -185,7 +196,11 @@ public class PlayerData {
validator.addRule(new NonNullRule<>());
for(SuperAbilityType superSkill : SuperAbilityType.values()) {
validator.validate(map.get(superSkill));
try {
validator.validate(map.get(superSkill));
} catch (Exception e) {
throw new UnexpectedValueException();
}
}
}

2
src/main/java/com/gmail/nossr50/datatypes/validation/NonNullRule.java
View File

@@ -2,7 +2,7 @@ package com.gmail.nossr50.datatypes.validation;
public class NonNullRule<T> extends Rule<T> {
@Override
public void applyRule(T object) throws Exception {
public void applyRule(T object) throws NullPointerException {
if(object == null)
throw new NullPointerException();
}

4
src/main/java/com/gmail/nossr50/datatypes/validation/PositiveIntegerRule.java
View File

@@ -1,10 +1,10 @@
package com.gmail.nossr50.datatypes.validation;
import com.gmail.nossr50.api.exceptions.UnexpectedValueException;
import com.neetgames.mcmmo.exceptions.UnexpectedValueException;
public class PositiveIntegerRule<T extends Number> extends Rule<T> {
@Override
public void applyRule(T number) throws Exception {
public void applyRule(T number) throws UnexpectedValueException {
if(number.intValue() < 0)
throw new UnexpectedValueException();
}