lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete shortcuts should consider type for auto use.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-12-10 03:17:11 +00:00
parent 9526fd2ece
commit 4e1be1aa3f
16 changed files with 296 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
View File

@ -57,34 +57,47 @@ public class RequestShortCutDel implements IClientIncomingPacket
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page); final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. if (oldShortcut != null)
if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); boolean removed = true;
for (Shortcut shortcut : player.getAllShortCuts())
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{ {
if (oldShortcut.getId() == shortcut.getId()) player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
removed = false; {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
} }
} }
}
// Remove auto used ids.
// Remove auto used ids. if (removed)
if (removed)
{
final int id = oldShortcut == null ? -1 : oldShortcut.getId();
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); switch (oldShortcut.getType())
} {
else case SKILL:
{ {
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
} }
} }

9
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@ -93,16 +93,13 @@ public class RequestShortCutReg implements IClientIncomingPacket
// Activate if any other similar shortcut is activated. // Activate if any other similar shortcut is activated.
for (Shortcut shortcut : player.getAllShortCuts()) for (Shortcut shortcut : player.getAllShortCuts())
{ {
if (!shortcut.isAutoUse() || (shortcut.getType() != _type)) if (!shortcut.isAutoUse() || (shortcut.getId() != _id) || (shortcut.getType() != _type))
{ {
continue; continue;
} }
if (_id == shortcut.getId()) player.addAutoShortcut(_slot, _page);
{ break;
player.addAutoShortcut(_slot, _page);
break;
}
} }
} }
} }

55
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
View File

@ -57,34 +57,47 @@ public class RequestShortCutDel implements IClientIncomingPacket
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page); final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. if (oldShortcut != null)
if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); boolean removed = true;
for (Shortcut shortcut : player.getAllShortCuts())
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{ {
if (oldShortcut.getId() == shortcut.getId()) player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
removed = false; {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
} }
} }
}
// Remove auto used ids.
// Remove auto used ids. if (removed)
if (removed)
{
final int id = oldShortcut == null ? -1 : oldShortcut.getId();
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); switch (oldShortcut.getType())
} {
else case SKILL:
{ {
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
} }
} }

9
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@ -93,16 +93,13 @@ public class RequestShortCutReg implements IClientIncomingPacket
// Activate if any other similar shortcut is activated. // Activate if any other similar shortcut is activated.
for (Shortcut shortcut : player.getAllShortCuts()) for (Shortcut shortcut : player.getAllShortCuts())
{ {
if (!shortcut.isAutoUse() || (shortcut.getType() != _type)) if (!shortcut.isAutoUse() || (shortcut.getId() != _id) || (shortcut.getType() != _type))
{ {
continue; continue;
} }
if (_id == shortcut.getId()) player.addAutoShortcut(_slot, _page);
{ break;
player.addAutoShortcut(_slot, _page);
break;
}
} }
} }
} }

55
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
View File

@ -57,34 +57,47 @@ public class RequestShortCutDel implements IClientIncomingPacket
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page); final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. if (oldShortcut != null)
if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); boolean removed = true;
for (Shortcut shortcut : player.getAllShortCuts())
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{ {
if (oldShortcut.getId() == shortcut.getId()) player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
removed = false; {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
} }
} }
}
// Remove auto used ids.
// Remove auto used ids. if (removed)
if (removed)
{
final int id = oldShortcut == null ? -1 : oldShortcut.getId();
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); switch (oldShortcut.getType())
} {
else case SKILL:
{ {
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
} }
} }

9
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@ -93,16 +93,13 @@ public class RequestShortCutReg implements IClientIncomingPacket
// Activate if any other similar shortcut is activated. // Activate if any other similar shortcut is activated.
for (Shortcut shortcut : player.getAllShortCuts()) for (Shortcut shortcut : player.getAllShortCuts())
{ {
if (!shortcut.isAutoUse() || (shortcut.getType() != _type)) if (!shortcut.isAutoUse() || (shortcut.getId() != _id) || (shortcut.getType() != _type))
{ {
continue; continue;
} }
if (_id == shortcut.getId()) player.addAutoShortcut(_slot, _page);
{ break;
player.addAutoShortcut(_slot, _page);
break;
}
} }
} }
} }

55
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
View File

@ -57,34 +57,47 @@ public class RequestShortCutDel implements IClientIncomingPacket
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page); final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. if (oldShortcut != null)
if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); boolean removed = true;
for (Shortcut shortcut : player.getAllShortCuts())
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{ {
if (oldShortcut.getId() == shortcut.getId()) player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
removed = false; {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
} }
} }
}
// Remove auto used ids.
// Remove auto used ids. if (removed)
if (removed)
{
final int id = oldShortcut == null ? -1 : oldShortcut.getId();
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); switch (oldShortcut.getType())
} {
else case SKILL:
{ {
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
} }
} }

9
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@ -93,16 +93,13 @@ public class RequestShortCutReg implements IClientIncomingPacket
// Activate if any other similar shortcut is activated. // Activate if any other similar shortcut is activated.
for (Shortcut shortcut : player.getAllShortCuts()) for (Shortcut shortcut : player.getAllShortCuts())
{ {
if (!shortcut.isAutoUse() || (shortcut.getType() != _type)) if (!shortcut.isAutoUse() || (shortcut.getId() != _id) || (shortcut.getType() != _type))
{ {
continue; continue;
} }
if (_id == shortcut.getId()) player.addAutoShortcut(_slot, _page);
{ break;
player.addAutoShortcut(_slot, _page);
break;
}
} }
} }
} }

55
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
View File

@ -57,34 +57,47 @@ public class RequestShortCutDel implements IClientIncomingPacket
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page); final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. if (oldShortcut != null)
if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); boolean removed = true;
for (Shortcut shortcut : player.getAllShortCuts())
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{ {
if (oldShortcut.getId() == shortcut.getId()) player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
removed = false; {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
} }
} }
}
// Remove auto used ids.
// Remove auto used ids. if (removed)
if (removed)
{
final int id = oldShortcut == null ? -1 : oldShortcut.getId();
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); switch (oldShortcut.getType())
} {
else case SKILL:
{ {
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
} }
} }

9
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@ -93,16 +93,13 @@ public class RequestShortCutReg implements IClientIncomingPacket
// Activate if any other similar shortcut is activated. // Activate if any other similar shortcut is activated.
for (Shortcut shortcut : player.getAllShortCuts()) for (Shortcut shortcut : player.getAllShortCuts())
{ {
if (!shortcut.isAutoUse() || (shortcut.getType() != _type)) if (!shortcut.isAutoUse() || (shortcut.getId() != _id) || (shortcut.getType() != _type))
{ {
continue; continue;
} }
if (_id == shortcut.getId()) player.addAutoShortcut(_slot, _page);
{ break;
player.addAutoShortcut(_slot, _page);
break;
}
} }
} }
} }

55
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
View File

@ -57,34 +57,47 @@ public class RequestShortCutDel implements IClientIncomingPacket
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page); final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. if (oldShortcut != null)
if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); boolean removed = true;
for (Shortcut shortcut : player.getAllShortCuts())
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{ {
if (oldShortcut.getId() == shortcut.getId()) player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
removed = false; {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
} }
} }
}
// Remove auto used ids.
// Remove auto used ids. if (removed)
if (removed)
{
final int id = oldShortcut == null ? -1 : oldShortcut.getId();
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); switch (oldShortcut.getType())
} {
else case SKILL:
{ {
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
} }
} }

9
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@ -93,16 +93,13 @@ public class RequestShortCutReg implements IClientIncomingPacket
// Activate if any other similar shortcut is activated. // Activate if any other similar shortcut is activated.
for (Shortcut shortcut : player.getAllShortCuts()) for (Shortcut shortcut : player.getAllShortCuts())
{ {
if (!shortcut.isAutoUse() || (shortcut.getType() != _type)) if (!shortcut.isAutoUse() || (shortcut.getId() != _id) || (shortcut.getType() != _type))
{ {
continue; continue;
} }
if (_id == shortcut.getId()) player.addAutoShortcut(_slot, _page);
{ break;
player.addAutoShortcut(_slot, _page);
break;
}
} }
} }
} }

55
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
View File

@ -57,34 +57,47 @@ public class RequestShortCutDel implements IClientIncomingPacket
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page); final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. if (oldShortcut != null)
if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); boolean removed = true;
for (Shortcut shortcut : player.getAllShortCuts())
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{ {
if (oldShortcut.getId() == shortcut.getId()) player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
removed = false; {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
} }
} }
}
// Remove auto used ids.
// Remove auto used ids. if (removed)
if (removed)
{
final int id = oldShortcut == null ? -1 : oldShortcut.getId();
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); switch (oldShortcut.getType())
} {
else case SKILL:
{ {
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
} }
} }

9
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@ -93,16 +93,13 @@ public class RequestShortCutReg implements IClientIncomingPacket
// Activate if any other similar shortcut is activated. // Activate if any other similar shortcut is activated.
for (Shortcut shortcut : player.getAllShortCuts()) for (Shortcut shortcut : player.getAllShortCuts())
{ {
if (!shortcut.isAutoUse() || (shortcut.getType() != _type)) if (!shortcut.isAutoUse() || (shortcut.getId() != _id) || (shortcut.getType() != _type))
{ {
continue; continue;
} }
if (_id == shortcut.getId()) player.addAutoShortcut(_slot, _page);
{ break;
player.addAutoShortcut(_slot, _page);
break;
}
} }
} }
} }

55
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
View File

@ -57,34 +57,47 @@ public class RequestShortCutDel implements IClientIncomingPacket
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page); final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. if (oldShortcut != null)
if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); boolean removed = true;
for (Shortcut shortcut : player.getAllShortCuts())
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{ {
if (oldShortcut.getId() == shortcut.getId()) player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
removed = false; {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
} }
} }
}
// Remove auto used ids.
// Remove auto used ids. if (removed)
if (removed)
{
final int id = oldShortcut == null ? -1 : oldShortcut.getId();
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); switch (oldShortcut.getType())
} {
else case SKILL:
{ {
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
} }
} }

9
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@ -93,16 +93,13 @@ public class RequestShortCutReg implements IClientIncomingPacket
// Activate if any other similar shortcut is activated. // Activate if any other similar shortcut is activated.
for (Shortcut shortcut : player.getAllShortCuts()) for (Shortcut shortcut : player.getAllShortCuts())
{ {
if (!shortcut.isAutoUse() || (shortcut.getType() != _type)) if (!shortcut.isAutoUse() || (shortcut.getId() != _id) || (shortcut.getType() != _type))
{ {
continue; continue;
} }
if (_id == shortcut.getId()) player.addAutoShortcut(_slot, _page);
{ break;
player.addAutoShortcut(_slot, _page);
break;
}
} }
} }
} }