Преглед на файлове

This will prevent some skill exploitation while transformed.
Also some minor grammar touch up.

Ahmed преди 17 години
родител
ревизия
1e423cb9ed

+ 3 - 0
L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2FishermanInstance.java

@@ -100,6 +100,9 @@ public class L2FishermanInstance extends L2MerchantInstance
 
 	public void showSkillList(L2PcInstance player)
 	{
+		if (player.isTransformed())
+        	return;
+		
 		L2SkillLearn[] skills = SkillTreeTable.getInstance().getAvailableSkills(player);
 		AcquireSkillList asl = new AcquireSkillList(AcquireSkillList.skillType.Fishing);
 

+ 7 - 6
L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2FolkInstance.java

@@ -369,6 +369,9 @@ public class L2FolkInstance extends L2NpcInstance
 	@Override
 	public void onBypassFeedback(L2PcInstance player, String command)
 	{
+		if (player.isTransformed())
+        	return;
+		
 		if (command.startsWith("SkillList"))
 		{
 			if (Config.ALT_GAME_SKILL_LEARN)
@@ -400,14 +403,12 @@ public class L2FolkInstance extends L2NpcInstance
 
 					if (!own_class)
                     {
-						String mages = player.getClassId().isMage() ? "fighters" : "mages";
+						String charType = player.getClassId().isMage() ? "fighter" : "mage";
 						text +=
 							"Skills of your class are the easiest to learn.<br>"+
-							"Skills of another class are harder.<br>"+
-							"Skills for another race are even more hard to learn.<br>"+
-							"You can also learn skills of "+mages+", and they are"+
-							" the hardest to learn!<br>"+
-							"<br>";
+							"Skills of another class of your race are a little harder.<br>"+
+							"Skills for classes of another race are extremely difficult.<br>"+
+							"But the hardest of all to learn are the  "+ charType +"skills!<br>";
 					}
 
 					// make a list of classes

+ 5 - 1
L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2VillageMasterInstance.java

@@ -819,7 +819,11 @@ public final class L2VillageMasterInstance extends L2FolkInstance
     {
         if (Config.DEBUG)
             _log.fine("PledgeSkillList activated on: "+getObjectId());
-        if(player.getClan() == null) return;
+        if(player.getClan() == null)
+        	return;
+        
+        if (player.isTransformed())
+        	return;
 
         L2PledgeSkillLearn[] skills = SkillTreeTable.getInstance().getAvailablePledgeSkills(player);
         AcquireSkillList asl = new AcquireSkillList(AcquireSkillList.skillType.Clan);