Fixed using summon stop and attack actions increasing attack speed.
This commit is contained in:
parent
bd70fb6056
commit
6148cfd880
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -686,7 +686,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
{
|
||||
// If PlayerInstance is dead or the target is dead, the action is stoped
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
@ -695,7 +694,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
{
|
||||
// If PlayerInstance is dead or the target is dead, the action is stoped
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
@ -704,7 +702,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
{
|
||||
// If PlayerInstance is dead or the target is dead, the action is stoped
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
@ -713,7 +710,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
{
|
||||
// If PlayerInstance is dead or the target is dead, the action is stoped
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
@ -722,7 +718,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
{
|
||||
// If PlayerInstance is dead or the target is dead, the action is stoped
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
@ -774,7 +769,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
// You can't make an attack with a fishing pole.
|
||||
((PlayerInstance) this).sendPacket(SystemMessageId.YOU_LOOK_ODDLY_AT_THE_FISHING_POLE_IN_DISBELIEF_AND_REALIZE_THAT_YOU_CAN_T_ATTACK_ANYTHING_WITH_THIS);
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
@ -804,7 +798,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
{
|
||||
// Cancel the action because the PlayerInstance have no arrow
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_RUN_OUT_OF_ARROWS));
|
||||
return;
|
||||
|
@ -688,7 +688,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
{
|
||||
// If PlayerInstance is dead or the target is dead, the action is stoped
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
@ -697,7 +696,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
{
|
||||
// If PlayerInstance is dead or the target is dead, the action is stoped
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
@ -706,7 +704,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
{
|
||||
// If PlayerInstance is dead or the target is dead, the action is stoped
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
@ -715,7 +712,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
{
|
||||
// If PlayerInstance is dead or the target is dead, the action is stoped
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
@ -724,7 +720,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
{
|
||||
// If PlayerInstance is dead or the target is dead, the action is stoped
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
@ -733,7 +728,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
{
|
||||
// If PlayerInstance is dead or the target is dead, the action is stoped
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
@ -765,7 +759,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
|
||||
if (((PlayerInstance) this).isCursedWeaponEquiped() && (((PlayerInstance) target).getLevel() <= Config.MAX_LEVEL_NEWBIE))
|
||||
{
|
||||
((PlayerInstance) this).sendMessage("Can't attack a newbie player using a cursed weapon.");
|
||||
@ -802,7 +795,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
// You can't make an attack with a fishing pole.
|
||||
((PlayerInstance) this).sendPacket(SystemMessageId.YOU_LOOK_ODDLY_AT_THE_FISHING_POLE_IN_DISBELIEF_AND_REALIZE_THAT_YOU_CAN_T_ATTACK_ANYTHING_WITH_THIS);
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
return;
|
||||
}
|
||||
@ -832,7 +824,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
{
|
||||
// Cancel the action because the PlayerInstance have no arrow
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
|
||||
|
||||
sendPacket(ActionFailed.STATIC_PACKET);
|
||||
sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_RUN_OUT_OF_ARROWS));
|
||||
return;
|
||||
|
@ -986,15 +986,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -986,15 +986,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
@ -974,15 +974,6 @@ public abstract class Summon extends Playable
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isAttackingDisabled())
|
||||
{
|
||||
if (!isAttackingNow())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
|
||||
}
|
||||
|
||||
if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
|
||||
{
|
||||
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);
|
||||
|
Loading…
Reference in New Issue
Block a user