lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reuse already known ClassIds.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-10-22 22:17:03 +00:00
parent ed6f1558aa
commit 42ff398c5e
16 changed files with 32 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -832,7 +832,6 @@ public class Raina extends AbstractNpcAI
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -841,12 +840,10 @@ public class Raina extends AbstractNpcAI
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@ -834,7 +834,6 @@ public class Raina extends AbstractNpcAI
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -843,12 +842,10 @@ public class Raina extends AbstractNpcAI
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -883,7 +883,6 @@ public class VillageMasterInstance extends NpcInstance
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -892,12 +891,10 @@ public class VillageMasterInstance extends NpcInstance
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance
// } // }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }

7
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -867,7 +867,6 @@ public class VillageMasterInstance extends NpcInstance
} }
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass); Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null) if (unavailableClasses != null)
{ {
subclasses.removeAll(unavailableClasses); subclasses.removeAll(unavailableClasses);
@ -876,12 +875,10 @@ public class VillageMasterInstance extends NpcInstance
if (subclasses != null) if (subclasses != null)
{ {
final ClassId currClassId = ClassId.getClassId(player.getClassId().getId()); final ClassId currClassId = player.getClassId();
for (ClassId tempClass : subclasses) for (ClassId tempClass : subclasses)
{ {
final ClassId tempClassId = ClassId.getClassId(tempClass.getId()); if (currClassId.equalsOrChildOf(tempClass))
if (currClassId.equalsOrChildOf(tempClassId))
{ {
subclasses.remove(tempClass); subclasses.remove(tempClass);
} }