Fixed using summon stop and attack actions increasing attack speed.

This commit is contained in:
MobiusDevelopment
2020-10-08 00:28:00 +00:00
parent bd70fb6056
commit 6148cfd880
19 changed files with 0 additions and 169 deletions

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -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 // If PlayerInstance is dead or the target is dead, the action is stoped
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; 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 // If PlayerInstance is dead or the target is dead, the action is stoped
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; 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 // If PlayerInstance is dead or the target is dead, the action is stoped
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; 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 // If PlayerInstance is dead or the target is dead, the action is stoped
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; 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 // If PlayerInstance is dead or the target is dead, the action is stoped
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -774,7 +769,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
// You can't make an attack with a fishing pole. // 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); ((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); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -804,7 +798,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
{ {
// Cancel the action because the PlayerInstance have no arrow // Cancel the action because the PlayerInstance have no arrow
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_RUN_OUT_OF_ARROWS)); sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_RUN_OUT_OF_ARROWS));
return; return;

View File

@@ -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 // If PlayerInstance is dead or the target is dead, the action is stoped
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; 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 // If PlayerInstance is dead or the target is dead, the action is stoped
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; 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 // If PlayerInstance is dead or the target is dead, the action is stoped
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; 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 // If PlayerInstance is dead or the target is dead, the action is stoped
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; 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 // If PlayerInstance is dead or the target is dead, the action is stoped
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; 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 // If PlayerInstance is dead or the target is dead, the action is stoped
getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE); getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -765,7 +759,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
if (((PlayerInstance) this).isCursedWeaponEquiped() && (((PlayerInstance) target).getLevel() <= Config.MAX_LEVEL_NEWBIE)) if (((PlayerInstance) this).isCursedWeaponEquiped() && (((PlayerInstance) target).getLevel() <= Config.MAX_LEVEL_NEWBIE))
{ {
((PlayerInstance) this).sendMessage("Can't attack a newbie player using a cursed weapon."); ((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. // 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); ((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); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
@@ -832,7 +824,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
{ {
// Cancel the action because the PlayerInstance have no arrow // Cancel the action because the PlayerInstance have no arrow
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_RUN_OUT_OF_ARROWS)); sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_RUN_OUT_OF_ARROWS));
return; return;

View File

@@ -986,15 +986,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -986,15 +986,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);

View File

@@ -974,15 +974,6 @@ public abstract class Summon extends Playable
return false; return false;
} }
if (isAttackingDisabled())
{
if (!isAttackingNow())
{
return false;
}
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
if (isPet() && ((getLevel() - _owner.getLevel()) > 20)) if (isPet() && ((getLevel() - _owner.getLevel()) > 20))
{ {
sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL); sendPacket(SystemMessageId.YOUR_PET_IS_TOO_HIGH_LEVEL_TO_CONTROL);