diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index d31a3ba428..a16fbb10c9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index d31a3ba428..a16fbb10c9 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index d31a3ba428..a16fbb10c9 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index d31a3ba428..a16fbb10c9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 1a435c9197..2473016835 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 9028eb20e5..3043e8ee5d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 9028eb20e5..3043e8ee5d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 9028eb20e5..3043e8ee5d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index b70fd9fa86..7ff268790a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index 1c8da5c00b..879cfbbf11 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -124,6 +124,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5081db44c1..6276994062 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -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(); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 8085f86c0d..e2bd8183a5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -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())) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index ad11863c61..be1fecf408 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index b70fd9fa86..7ff268790a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index 1c8da5c00b..879cfbbf11 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -124,6 +124,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5081db44c1..6276994062 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -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(); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 8085f86c0d..e2bd8183a5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -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())) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index ad11863c61..be1fecf408 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index d31a3ba428..a16fbb10c9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index d31a3ba428..a16fbb10c9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 92bc89b7bb..aafa962cc8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 26c849f472..f761c2bba3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 26c849f472..f761c2bba3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 26c849f472..f761c2bba3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 3103e8936c..9b86ff3cb3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -132,6 +132,8 @@ public class Action implements IClientIncomingPacket return; } + player.onActionRequest(); + switch (_actionId) { case 0: diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java index df9fd4f5bf..6ad7d36f1f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -121,6 +121,8 @@ public class Attack implements IClientIncomingPacket return; } + player.onActionRequest(); + if (player.getTarget() != target) { target.onAction(player); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 5bde989957..97573fa471 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -246,9 +246,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket } // Mobius: Check spawn protections. - if (player.isSpawnProtected() || player.isTeleportProtected()) - { - player.onActionRequest(); - } + player.onActionRequest(); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index ffc1112ad9..54dce8ec11 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -85,6 +85,8 @@ public class RequestMagicSkillUse implements IClientIncomingPacket return; } + player.onActionRequest(); + player.useMagic(skill, null, _ctrlPressed, _shiftPressed); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 504c55cdb7..1122cdd5e4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -169,6 +169,8 @@ public class UseItem implements IClientIncomingPacket } } + player.onActionRequest(); + if (item.isEquipable()) { // Max equipable item grade configuration.