trance's subs

Index: src/net/sf/l2j/gameserver/model/base/PlayerClass.java
===================================================================
--- src/net/sf/l2j/gameserver/model/base/PlayerClass.java   (revision 2)
+++ src/net/sf/l2j/gameserver/model/base/PlayerClass.java   (working copy)
@@ -27,7 +27,6 @@
 import static net.sf.l2j.gameserver.model.base.Race.Human;
 import static net.sf.l2j.gameserver.model.base.Race.Orc;

-import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.Set;

@@ -171,43 +170,12 @@
    private ClassType _type;

    private static final Set<PlayerClass> mainSubclassSet;
-   private static final Set<PlayerClass> neverSubclassed = EnumSet.of(Overlord, Warsmith);

-   private static final Set<PlayerClass> subclasseSet1 = EnumSet.of(DarkAvenger, Paladin, TempleKnight, ShillienKnight);
-   private static final Set<PlayerClass> subclasseSet2 = EnumSet.of(TreasureHunter, AbyssWalker, Plainswalker);
-   private static final Set<PlayerClass> subclasseSet3 = EnumSet.of(Hawkeye, SilverRanger, PhantomRanger);
-   private static final Set<PlayerClass> subclasseSet4 = EnumSet.of(Warlock, ElementalSummoner, PhantomSummoner);
-   private static final Set<PlayerClass> subclasseSet5 = EnumSet.of(Sorceror, Spellsinger, Spellhowler);
-
-   private static final EnumMap<PlayerClass, Set<PlayerClass>> subclassSetMap = new EnumMap<>(PlayerClass.class);
-
    static
    {
        Set<PlayerClass> subclasses = getSet(null, Third);
-       subclasses.removeAll(neverSubclassed);

        mainSubclassSet = subclasses;
-
-       subclassSetMap.put(DarkAvenger, subclasseSet1);
-       subclassSetMap.put(Paladin, subclasseSet1);
-       subclassSetMap.put(TempleKnight, subclasseSet1);
-       subclassSetMap.put(ShillienKnight, subclasseSet1);
-
-       subclassSetMap.put(TreasureHunter, subclasseSet2);
-       subclassSetMap.put(AbyssWalker, subclasseSet2);
-       subclassSetMap.put(Plainswalker, subclasseSet2);
-
-       subclassSetMap.put(Hawkeye, subclasseSet3);
-       subclassSetMap.put(SilverRanger, subclasseSet3);
-       subclassSetMap.put(PhantomRanger, subclasseSet3);
-
-       subclassSetMap.put(Warlock, subclasseSet4);
-       subclassSetMap.put(ElementalSummoner, subclasseSet4);
-       subclassSetMap.put(PhantomSummoner, subclasseSet4);
-
-       subclassSetMap.put(Sorceror, subclasseSet5);
-       subclassSetMap.put(Spellsinger, subclasseSet5);
-       subclassSetMap.put(Spellhowler, subclasseSet5);
    }

    PlayerClass(Race pRace, ClassType pType, ClassLevel pLevel)
@@ -224,23 +192,7 @@
        if (_level == Third)
        {
            subclasses = EnumSet.copyOf(mainSubclassSet);
-           subclasses.removeAll(neverSubclassed);
            subclasses.remove(this);
-
-           switch (player.getRace())
-           {
-               case Elf:
-                   subclasses.removeAll(getSet(DarkElf, Third));
-                   break;
-               case DarkElf:
-                   subclasses.removeAll(getSet(Elf, Third));
-                   break;
-           }
-
-           Set<PlayerClass> unavailableClasses = subclassSetMap.get(this);
-
-           if (unavailableClasses != null)
-               subclasses.removeAll(unavailableClasses);
        }

        return subclasses;
@@ -255,9 +207,7 @@
            if (race == null || playerClass.isOfRace(race))
            {
                if (level == null || playerClass.isOfLevel(level))
-               {
                    allOf.add(playerClass);
-               }
            }
        }

Index: src/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java
===================================================================
--- src/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java    (revision 2)
+++ src/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java    (working copy)
@@ -8487,7 +8487,7 @@

        try
        {
-           if (getTotalSubClasses() == 3 || classIndex == 0)
+           if (getTotalSubClasses() == 12 || classIndex == 0)
                return false;

            if (getSubClasses().containsKey(classIndex))
Index: src/net/sf/l2j/gameserver/model/actor/instance/L2VillageMasterInstance.java
===================================================================
--- src/net/sf/l2j/gameserver/model/actor/instance/L2VillageMasterInstance.java (revision 2)
+++ src/net/sf/l2j/gameserver/model/actor/instance/L2VillageMasterInstance.java (working copy)
@@ -219,7 +219,7 @@
                    }

                    // Avoid giving player an option to add a new sub class, if they have three already.
-                   if (player.getTotalSubClasses() >= 3)
+                   if (player.getTotalSubClasses() >= 12)
                    {
                        html.setFile("data/html/villagemaster/SubClass_Fail.htm");
                        break;
@@ -328,7 +328,7 @@

                    boolean allowAddition = true;

-                   if (player.getTotalSubClasses() >= 3)
+                   if (player.getTotalSubClasses() >= 12)
                        allowAddition = false;

                    if (player.getLevel() < 75)
@@ -491,7 +491,7 @@
        return true;
    }

-   private final Set<PlayerClass> getAvailableSubClasses(L2PcInstance player)
+   private final static Set<PlayerClass> getAvailableSubClasses(L2PcInstance player)
    {
        // get player base class
        final int currentBaseId = player.getBaseClass();
@@ -547,7 +547,7 @@
    /*
     * Check new subclass classId for validity (villagemaster race/type is not contains in previous subclasses, but in allowed subclasses) Base class not added into allowed subclasses.
     */
-   private final boolean isValidNewSubClass(L2PcInstance player, int classId)
+   private final static boolean isValidNewSubClass(L2PcInstance player, int classId)
    {
        if (!checkVillageMaster(classId))
            return false;
@@ -603,7 +603,7 @@
    /*
     * Returns true if this classId allowed for master
     */
-   public final boolean checkVillageMaster(int classId)
+   public final static boolean checkVillageMaster(int classId)
    {
        return checkVillageMaster(PlayerClass.values()[classId]);
    }
@@ -611,9 +611,10 @@
    /*
     * Returns true if this PlayerClass is allowed for master
     */
-   public final boolean checkVillageMaster(PlayerClass pclass)
+   public final static boolean checkVillageMaster(PlayerClass pclass)
    {
-       return checkVillageMasterRace(pclass) && checkVillageMasterTeachType(pclass);
+       return true;
    }

    private static final String formatClassForDisplay(PlayerClass className)