Share] Sub-Class Master NPC

Index: L2jFrozen_GameServer\head-src\com\l2jfrozen\gameserver\model\actor\instance\L2VillageMasterInstance.java
===================================================================
--- head-src\com\l2jfrozen\gameserver\model\actor\instance\L2VillageMasterInstance.java	(revision 912)
+++ head-src\com\l2jfrozen\gameserver\model\actor\instance\L2VillageMasterInstance.java	(working copy)
@@ -1010,1 +1010,9 @@
-		final PlayerRace npcRace = getVillageMasterRace();
-		final ClassType npcTeachType = getVillageMasterTeachType();
+		getVillageMasterRace();
+		getVillageMasterTeachType();

@@ -1049,1 +1049,5 @@
-
-				if(npcRace == PlayerRace.Human || npcRace == PlayerRace.LightElf)
-				{
-					// If the master is human or light elf, ensure that fighter-type
-					// masters only teach fighter classes, and priest-type masters
-					// only teach priest classes etc.
-					if(!availSub.isOfType(npcTeachType))
-					{
-						availSubs.remove(availSub);
-					}
-					else if(!availSub.isOfRace(PlayerRace.Human) && !availSub.isOfRace(PlayerRace.LightElf))
-					{
-						availSubs.remove(availSub);
-					}
-				}
-				else
-				{
-					// If the master is not human and not light elf,
-					// then remove any classes not of the same race as the master.
-					if(npcRace != PlayerRace.Human && npcRace != PlayerRace.LightElf && !availSub.isOfRace(npcRace))
-					{
-						availSubs.remove(availSub);
-					}
-				}
(/No newline at the end of the line)

Index: L2jFrozen_GameServer\head-src\com\l2jfrozen\gameserver\model\actor\instance\L2VillageMasterInstance.java
===================================================================
--- head-src\com\l2jfrozen\gameserver\model\base\PlayerClass.java	(revision 59)
+++ head-src\com\l2jfrozen\gameserver\model\base\PlayerClass.java	(working copy)
@@ -196,1 +196,5 @@
	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, Set<PlayerClass>>(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);

@@ -252,1 +252,9 @@
-			subclasses.removeAll(neverSubclassed);
-			subclasses.remove(this);
-
-			switch(player.getRace())
-			{
-				case elf:
-					subclasses.removeAll(getSet(DarkElf, Third));
-					break;
-				case darkelf:
-					subclasses.removeAll(getSet(LightElf, Third));
-					break;
-			}
-
-			Set<PlayerClass> unavailableClasses = subclassSetMap.get(this);
-
-			if(unavailableClasses != null)
-			{
-				subclasses.removeAll(unavailableClasses);
-			}
-
-			unavailableClasses = null;

@@ -222,1 +222,13 @@
if(_level == Third)
		{
			subclasses = EnumSet.copyOf(mainSubclassSet);
+
+subclasses.remove(this);
+
+			switch(player.getRace())
+			{
+				case human:
+					break;
+				case darkelf:
+					break;
+				case elf:
+					break;
+				case orc:
+					break;
+				case dwarf:
+					break;
+
			}
		}

		return subclasses;
	}
	(/No newline at the end of the line)