### Eclipse Workspace Patch 1.0
#P L2jFrozen_GameServer
Index: head-src/com/l2jfrozen/gameserver/model/actor/instance/L2VillageMasterInstance.java
===================================================================
--- head-src/com/l2jfrozen/gameserver/model/actor/instance/L2VillageMasterInstance.java (revision 25)
+++ head-src/com/l2jfrozen/gameserver/model/actor/instance/L2VillageMasterInstance.java (working copy)
@@ -1063,8 +1063,8 @@
charClassId = player.getClassId().getParent().ordinal();
}
- final PlayerRace npcRace = getVillageMasterRace();
- final ClassType npcTeachType = getVillageMasterTeachType();
+ getVillageMasterRace();
+ getVillageMasterTeachType();
PlayerClass currClass = PlayerClass.values()[charClassId];
@@ -1102,32 +1102,9 @@
availSubs.remove(PlayerClass.values()[availSub.ordinal()]);
}
}
-
- 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);
- }
- }
}
}
+
currClass = null;
return availSubs;
}
εδώ είναι το 1 κομμάτι, το άλλο αύριο θα στο δώσω.