浏览代码

BETA: CORE-Part for [DP9258].

MELERIX 12 年之前
父节点
当前提交
4b265a6cbb
共有 1 个文件被更改,包括 3 次插入13 次删除
  1. 3 13
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

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

@@ -1839,11 +1839,6 @@ public abstract class L2Character extends L2Object
 			hitTime = skill.getHitTime();
 			coolTime = skill.getCoolTime();
 		}
-		// if basic hitTime is higher than 500 than the min hitTime is 500
-		else if ((skill.getHitTime() >= 500) && (hitTime < 500))
-		{
-			hitTime = 500;
-		}
 		
 		// queue herbs and potions
 		if (isCastingSimultaneouslyNow() && simultaneously)
@@ -1861,10 +1856,10 @@ public abstract class L2Character extends L2Object
 		{
 			setIsCastingNow(true);
 		}
-		// Note: _castEndTime = GameTimeController.getGameTicks() + (coolTime + hitTime) / GameTimeController.MILLIS_IN_TICK;
+		
 		if (!simultaneously)
 		{
-			_castInterruptTime = -2 + GameTimeController.getGameTicks() + (hitTime / GameTimeController.MILLIS_IN_TICK);
+			_castInterruptTime = -2 + GameTimeController.getGameTicks() + ((hitTime + coolTime) / GameTimeController.MILLIS_IN_TICK);
 			setLastSkillCast(skill);
 		}
 		else
@@ -2030,7 +2025,7 @@ public abstract class L2Character extends L2Object
 		MagicUseTask mut = new MagicUseTask(targets, skill, hitTime, coolTime, simultaneously);
 		
 		// launch the magic in hitTime milliseconds
-		if (hitTime > 410)
+		if (hitTime > 0)
 		{
 			// Send a Server->Client packet SetupGauge with the color of the gauge and the casting time
 			if (isPlayer() && !effectWhileCasting)
@@ -2041,11 +2036,6 @@ public abstract class L2Character extends L2Object
 			if (skill.getHitCounts() > 0)
 			{
 				hitTime = (hitTime * skill.getHitTimings()[0]) / 100;
-				
-				if (hitTime < 410)
-				{
-					hitTime = 410;
-				}
 			}
 			
 			if (effectWhileCasting)