More triggers for onActionRequest.

Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2019-11-03 04:40:45 +00:00
parent 53ed2f57f9
commit 01eaf9e042
85 changed files with 153 additions and 68 deletions

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -124,6 +124,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -228,9 +228,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(_targetX, _targetY, _targetZ));
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -112,6 +112,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
// Stop if use self-buff (except if on AirShip or Boat).
if ((skill.isContinuous() && !skill.isDebuff() && (skill.getTargetType() == TargetType.SELF)) && (!player.isInAirShip() || !player.isInBoat()))
{

View File

@ -170,6 +170,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -124,6 +124,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -228,9 +228,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(_targetX, _targetY, _targetZ));
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -112,6 +112,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
// Stop if use self-buff (except if on AirShip or Boat).
if ((skill.isContinuous() && !skill.isDebuff() && (skill.getTargetType() == TargetType.SELF)) && (!player.isInAirShip() || !player.isInBoat()))
{

View File

@ -170,6 +170,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -168,6 +168,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Don't allow to put formal wear while a cursed weapon is equipped.

View File

@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket
return;
}
player.onActionRequest();
switch (_actionId)
{
case 0:

View File

@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket
return;
}
player.onActionRequest();
if (player.getTarget() != target)
{
target.onAction(player);

View File

@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket
}
// Mobius: Check spawn protections.
if (player.isSpawnProtected() || player.isTeleportProtected())
{
player.onActionRequest();
}
player.onActionRequest();
}
}

View File

@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
return;
}
player.onActionRequest();
player.useMagic(skill, null, _ctrlPressed, _shiftPressed);
}
}

View File

@ -169,6 +169,8 @@ public class UseItem implements IClientIncomingPacket
}
}
player.onActionRequest();
if (item.isEquipable())
{
// Max equipable item grade configuration.