diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index 9ba9117939..73ed7f1821 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index 9ba9117939..73ed7f1821 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index 9ba9117939..73ed7f1821 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index 9ba9117939..73ed7f1821 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index 9ba9117939..73ed7f1821 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index 9ba9117939..73ed7f1821 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index 9ba9117939..73ed7f1821 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index 1d0afd2482..a7b2207d4f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -834,7 +834,6 @@ public class Raina extends AbstractNpcAI } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -843,12 +842,10 @@ public class Raina extends AbstractNpcAI if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 57d0f16c50..aa5ed69543 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -883,7 +883,6 @@ public class VillageMasterInstance extends NpcInstance } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -892,12 +891,10 @@ public class VillageMasterInstance extends NpcInstance if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 92f33ba953..98e5824f3a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 92f33ba953..98e5824f3a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 92f33ba953..98e5824f3a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 92f33ba953..98e5824f3a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 92f33ba953..98e5824f3a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index ca35e6bbb8..26ce86cba9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance // } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 92f33ba953..98e5824f3a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance } Set unavailableClasses = subclassSetMap.get(pClass); - if (unavailableClasses != null) { subclasses.removeAll(unavailableClasses); @@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance if (subclasses != null) { - final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); + final ClassId currClassId = player.getClassId(); for (ClassId tempClass : subclasses) { - final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); - - if (currClassId.equalsOrChildOf(tempClassId)) + if (currClassId.equalsOrChildOf(tempClass)) { subclasses.remove(tempClass); }