Selaa lähdekoodia

BETA: Minor fixes.
* Fixed some fall through case.
* Prevent deleting all Adena from player if the fee to delete subclass skills is negative.

Zoey76 13 vuotta sitten
vanhempi
sitoutus
147b4d6e63

+ 3 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TrainerHealersInstance.java

@@ -173,10 +173,13 @@ public final class L2TrainerHealersInstance extends L2TrainerInstance
 		{
 			case cardinal:
 				itemId = 15307;
+				break;
 			case evaSaint:
 				itemId = 15308;
+				break;
 			case shillienSaint:
 				itemId = 15309;
+				break;
 			default:
 				itemId = -1;
 		}

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TransformManagerInstance.java

@@ -225,7 +225,8 @@ public final class L2TransformManagerInstance extends L2MerchantInstance
 							}
 						}
 					}
-					st.takeItems(57, Config.FEE_DELETE_SUBCLASS_SKILLS);
+					
+					player.reduceAdena("Cleanse", Config.FEE_DELETE_SUBCLASS_SKILLS, this, true);
 					html.setFile(player.getHtmlPrefix(), htmlFolder + "master_transformation009no.htm");
 					player.sendSkillList();
 				}
@@ -320,8 +321,7 @@ public final class L2TransformManagerInstance extends L2MerchantInstance
 		
 		for (L2SkillLearn s : subClassSkills)
 		{
-			final L2Skill sk = SkillTable.getInstance().getInfo(s.getSkillId(), s.getSkillLevel());
-			if (sk != null)
+			if (SkillTable.getInstance().getInfo(s.getSkillId(), s.getSkillLevel()) != null)
 			{
 				count++;
 				asl.addSkill(s.getSkillId(), s.getSkillLevel(), s.getSkillLevel(), 0, 0);

+ 1 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -234,6 +234,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 					}
 					return;
 				}
+				break;
 			}
 			case SubPledge:
 			{