瀏覽代碼

BETA: Fixing minor typos:
* MagicSkillLaunched should not sent for Toggle skills.
* Recharge shots to determinate which one blessed or not spiritshots player have.
* Experience should not be casted as integer.
* Reported by: angkor_tm

Rumen Nikiforov 11 年之前
父節點
當前提交
e36ffd11b6

+ 2 - 13
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -5797,7 +5797,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			return;
 		}
 		
-		if (!skill.isChanneling())
+		if (!skill.isChanneling() && !skill.isToggle())
 		{
 			broadcastPacket(new MagicSkillLaunched(this, skill.getDisplayId(), skill.getDisplayLevel(), targets));
 		}
@@ -5917,18 +5917,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			// On each repeat restore shots before cast
 			if (mut.getCount() > 0)
 			{
-				final L2ItemInstance weaponInst = getActiveWeaponInstance();
-				if (weaponInst != null)
-				{
-					if (mut.getSkill().useSoulShot())
-					{
-						setChargedShot(ShotType.SOULSHOTS, true);
-					}
-					else if (mut.getSkill().useSpiritShot())
-					{
-						setChargedShot(ShotType.BLESSED_SPIRITSHOTS, true);
-					}
-				}
+				rechargeShots(mut.getSkill().useSoulShot(), mut.getSkill().useSpiritShot());
 			}
 			
 			// Launch the magic skill in order to calculate its effects

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java

@@ -204,7 +204,7 @@ public class PcStat extends PlayableStat
 			else
 			{
 				sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_EARNED_S1_EXP_AND_S2_SP);
-				sm.addLong((int) addToExp);
+				sm.addLong(addToExp);
 				sm.addInt(addToSp);
 			}
 		}