From 4035f45c4f552a26a6cd9d85d622c3efc1392f3d Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Wed, 27 Mar 2024 21:03:43 -0500
Subject: [PATCH] saetor skills

---
 src/engine/objects/CharacterSkill.java | 30 ++++++++------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/engine/objects/CharacterSkill.java b/src/engine/objects/CharacterSkill.java
index e789c416..a7a6a9d5 100644
--- a/src/engine/objects/CharacterSkill.java
+++ b/src/engine/objects/CharacterSkill.java
@@ -489,27 +489,6 @@ public class CharacterSkill extends AbstractGameObject {
             return;
 
         ConcurrentHashMap<String, CharacterSkill> skills = pc.getSkills();
-
-        if (pc.getRace().getName().equals("Saetor")) {
-            SkillsBase staff = SkillsBase.getFromCache(71438003);
-            if(staff != null && !skills.containsKey(staff.getName())){
-                CharacterSkill newSkill = new CharacterSkill(staff,pc); //staff
-                skills.put(staff.getName(),newSkill);
-                //newSkill.updateDatabase();
-            }
-            SkillsBase staffMastery = SkillsBase.getFromCache(-61022283);
-            if(staffMastery != null && !skills.containsKey(staffMastery.getName())){
-                CharacterSkill newSkill = new CharacterSkill(staffMastery,pc); //staff mastery
-                skills.put(staffMastery.getName(),newSkill);
-                //newSkill.updateDatabase();
-            }
-            SkillsBase parry = SkillsBase.getFromCache(95961104);
-            if(parry != null && !skills.containsKey(parry.getName())){
-                CharacterSkill newSkill = new CharacterSkill(parry,pc); //parry
-                skills.put(parry.getName(),newSkill);
-                //newSkill.updateDatabase();
-            }
-        }
         //First add skills that don't exist
         Race race = pc.getRace();
         if (race != null) {
@@ -581,6 +560,15 @@ public class CharacterSkill extends AbstractGameObject {
         if (skills == null)
             return;
 
+        if (pc.getRace().getName().equals("Saetor")) {
+            SkillReq parry = new SkillReq(95961104, (short) 1);
+            SkillReq staff = new SkillReq(71438003, (short) 15);
+            SkillReq staffMastery = new SkillReq(-61022283, (short) 1);
+            skillsGranted.add(parry);
+            skillsGranted.add(staff);
+            skillsGranted.add(staffMastery);
+        }
+
         for (SkillReq skillreq : skillsGranted) {
             SkillsBase skillsBase = skillreq.getSkillsBase();