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

do not use a fly type skill when movement is disabled, fixed #4320

janiii преди 15 години
родител
ревизия
540994b34a

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -1867,7 +1867,7 @@ public abstract class L2Character extends L2Object
 	 */
 	protected boolean checkDoCastConditions(L2Skill skill)
 	{
-		if (skill == null || isSkillDisabled(skill.getId()))
+		if (skill == null || isSkillDisabled(skill.getId()) || (skill.getFlyType() != null && isMovementDisabled()))
 		{
 			// Send a Server->Client packet ActionFailed to the L2PcInstance
             sendPacket(ActionFailed.STATIC_PACKET);

+ 3 - 0
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectWarp.java

@@ -77,6 +77,9 @@ public class EffectWarp extends L2Effect
 	{
 		_actor = isSelfEffect() ? getEffector() : getEffected();
 		
+		if (_actor.isMovementDisabled())
+			return false;
+		
 		int _radius = getSkill().getFlyRadius();
 		
 		double angle = Util.convertHeadingToDegree(_actor.getHeading());