From 8ea779a767d09023039a7c2e9de21fec499c229c Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 30 Jun 2022 21:15:48 +0000 Subject: [PATCH] Abstract updateSymbolSealSkills check for class id. Thanks to nasseka. --- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 4 ++-- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java index bba17c7bfd..c972b1654b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -6859,7 +6859,7 @@ public class Player extends Playable public void removeSymbolSealSkills() { final int classId = getClassId().getId(); - if (((classId >= 148) && (classId <= 181)) || (classId == 188) || (classId == 189)) + if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId)) { for (int i = 0; i < 3; i++) { @@ -6871,7 +6871,7 @@ public class Player extends Playable public void updateSymbolSealSkills() { final int classId = getClassId().getId(); - if (((classId >= 148) && (classId <= 181)) || (classId == 188) || (classId == 189)) + if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId)) { removeSymbolSealSkills(); if (getSymbolSealPoints() > 0) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java index 6d6442c65d..8b64693ec7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -6959,7 +6959,7 @@ public class Player extends Playable public void removeSymbolSealSkills() { final int classId = getClassId().getId(); - if (((classId >= 148) && (classId <= 181)) || (classId == 188) || (classId == 189)) + if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId)) { for (int i = 0; i < 3; i++) { @@ -6971,7 +6971,7 @@ public class Player extends Playable public void updateSymbolSealSkills() { final int classId = getClassId().getId(); - if (((classId >= 148) && (classId <= 181)) || (classId == 188) || (classId == 189)) + if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId)) { removeSymbolSealSkills(); if (getSymbolSealPoints() > 0) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java index 1e26cfe547..1c45e390cc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -6976,7 +6976,7 @@ public class Player extends Playable public void removeSymbolSealSkills() { final int classId = getClassId().getId(); - if (((classId >= 148) && (classId <= 181)) || (classId == 188) || (classId == 189)) + if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId)) { for (int i = 0; i < 3; i++) { @@ -6988,7 +6988,7 @@ public class Player extends Playable public void updateSymbolSealSkills() { final int classId = getClassId().getId(); - if (((classId >= 148) && (classId <= 181)) || (classId == 188) || (classId == 189)) + if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId)) { removeSymbolSealSkills(); if (getSymbolSealPoints() > 0) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 20c96fb112..de61ac0874 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -7013,7 +7013,7 @@ public class Player extends Playable public void removeSymbolSealSkills() { final int classId = getClassId().getId(); - if (((classId >= 148) && (classId <= 181)) || (classId == 188) || (classId == 189)) + if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId)) { for (int i = 0; i < 3; i++) { @@ -7025,7 +7025,7 @@ public class Player extends Playable public void updateSymbolSealSkills() { final int classId = getClassId().getId(); - if (((classId >= 148) && (classId <= 181)) || (classId == 188) || (classId == 189)) + if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId)) { removeSymbolSealSkills(); if (getSymbolSealPoints() > 0) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index f95747b439..9ca9b269c7 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -7041,7 +7041,7 @@ public class Player extends Playable public void removeSymbolSealSkills() { final int classId = getClassId().getId(); - if (((classId >= 148) && (classId <= 181)) || (classId == 188) || (classId == 189)) + if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId)) { for (int i = 0; i < 3; i++) { @@ -7053,7 +7053,7 @@ public class Player extends Playable public void updateSymbolSealSkills() { final int classId = getClassId().getId(); - if (((classId >= 148) && (classId <= 181)) || (classId == 188) || (classId == 189)) + if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, classId)) { removeSymbolSealSkills(); if (getSymbolSealPoints() > 0)