Skip to content

Null check added to TradeSkillPrerequisite #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rimaethon wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −6
Open

Null check added to TradeSkillPrerequisite #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions Assets/AnyRPG/Core/System/Scripts/Quest/TradeSkillPrerequisite.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,24 @@ public class TradeSkillPrerequisite : ConfiguredClass, IPrerequisite {

public void UpdateStatus(bool notify = true) {
bool originalResult = prerequisiteMet;
bool checkResult = playerManager.MyCharacter.CharacterSkillManager.HasSkill(prerequisiteSkill);
bool checkResult = false;

if (playerManager.MyCharacter != null) {
checkResult = playerManager.MyCharacter.CharacterSkillManager.HasSkill(prerequisiteSkill);
}

if (checkResult != originalResult) {
prerequisiteMet = checkResult;
if (notify == true) {
if (notify) {
OnStatusUpdated();
}
}
}

public void HandleSkillListChanged(Skill newSkill) {
UpdateStatus();
if (prerequisiteSkill != null) {
UpdateStatus();
}
}

public virtual bool IsMet(BaseCharacter baseCharacter) {
Expand All @@ -56,7 +63,7 @@ public void SetupScriptableObjects(SystemGameManager systemGameManager, string o
if (tmpPrerequisiteSkill != null) {
prerequisiteSkill = tmpPrerequisiteSkill;
} else {
Debug.LogError("SystemAbilityManager.SetupScriptableObjects(): Could not find skill : " + prerequisiteName + " while inititalizing a prerequisite for " + ownerName + ". CHECK INSPECTOR");
Debug.LogError("SystemAbilityManager.SetupScriptableObjects(): Could not find skill: " + prerequisiteName + " while initializing a prerequisite for " + ownerName + ". CHECK INSPECTOR");
}
}
systemEventManager.OnSkillListChanged += HandleSkillListChanged;
Expand All @@ -66,5 +73,4 @@ public void CleanupScriptableObjects() {
systemEventManager.OnSkillListChanged -= HandleSkillListChanged;
}
}

}
}