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

Fixed shortcut deletion removing active shortcuts from settings.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-10-12 18:00:30 +00:00
parent 2c31230f18
commit 501da02bad
6 changed files with 90 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
View File

@ -55,10 +55,11 @@ public class RequestShortCutDel implements IClientIncomingPacket
} }
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. // Keep other similar shortcuts activated.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
if ((oldShortcut != null) && oldShortcut.isAutoUse()) if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); player.removeAutoShortcut(_slot, _page);
@ -67,21 +68,26 @@ public class RequestShortCutDel implements IClientIncomingPacket
if (oldShortcut.getId() == shortcut.getId()) if (oldShortcut.getId() == shortcut.getId())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
} }
} }
} }
// Remove auto used ids. // Remove auto used ids.
final int id = oldShortcut == null ? -1 : oldShortcut.getId(); if (removed)
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); final int id = oldShortcut == null ? -1 : oldShortcut.getId();
} if (_slot > 263)
else {
{ AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id);
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); }
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); else
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, id);
AutoUseTaskManager.getInstance().removeAutoSkill(player, id);
}
} }
player.restoreAutoShortcutVisual(); player.restoreAutoShortcutVisual();
} }
} }

24
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
View File

@ -55,10 +55,11 @@ public class RequestShortCutDel implements IClientIncomingPacket
} }
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. // Keep other similar shortcuts activated.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
if ((oldShortcut != null) && oldShortcut.isAutoUse()) if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); player.removeAutoShortcut(_slot, _page);
@ -67,21 +68,26 @@ public class RequestShortCutDel implements IClientIncomingPacket
if (oldShortcut.getId() == shortcut.getId()) if (oldShortcut.getId() == shortcut.getId())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
} }
} }
} }
// Remove auto used ids. // Remove auto used ids.
final int id = oldShortcut == null ? -1 : oldShortcut.getId(); if (removed)
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); final int id = oldShortcut == null ? -1 : oldShortcut.getId();
} if (_slot > 263)
else {
{ AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id);
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); }
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); else
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, id);
AutoUseTaskManager.getInstance().removeAutoSkill(player, id);
}
} }
player.restoreAutoShortcutVisual(); player.restoreAutoShortcutVisual();
} }
} }

24
L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
View File

@ -55,10 +55,11 @@ public class RequestShortCutDel implements IClientIncomingPacket
} }
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. // Keep other similar shortcuts activated.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
if ((oldShortcut != null) && oldShortcut.isAutoUse()) if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); player.removeAutoShortcut(_slot, _page);
@ -67,21 +68,26 @@ public class RequestShortCutDel implements IClientIncomingPacket
if (oldShortcut.getId() == shortcut.getId()) if (oldShortcut.getId() == shortcut.getId())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
} }
} }
} }
// Remove auto used ids. // Remove auto used ids.
final int id = oldShortcut == null ? -1 : oldShortcut.getId(); if (removed)
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); final int id = oldShortcut == null ? -1 : oldShortcut.getId();
} if (_slot > 263)
else {
{ AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id);
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); }
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); else
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, id);
AutoUseTaskManager.getInstance().removeAutoSkill(player, id);
}
} }
player.restoreAutoShortcutVisual(); player.restoreAutoShortcutVisual();
} }
} }

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

@ -55,10 +55,11 @@ public class RequestShortCutDel implements IClientIncomingPacket
} }
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. // Keep other similar shortcuts activated.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
if ((oldShortcut != null) && oldShortcut.isAutoUse()) if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); player.removeAutoShortcut(_slot, _page);
@ -67,21 +68,26 @@ public class RequestShortCutDel implements IClientIncomingPacket
if (oldShortcut.getId() == shortcut.getId()) if (oldShortcut.getId() == shortcut.getId())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
} }
} }
} }
// Remove auto used ids. // Remove auto used ids.
final int id = oldShortcut == null ? -1 : oldShortcut.getId(); if (removed)
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); final int id = oldShortcut == null ? -1 : oldShortcut.getId();
} if (_slot > 263)
else {
{ AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id);
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); }
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); else
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, id);
AutoUseTaskManager.getInstance().removeAutoSkill(player, id);
}
} }
player.restoreAutoShortcutVisual(); player.restoreAutoShortcutVisual();
} }
} }

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

@ -55,10 +55,11 @@ public class RequestShortCutDel implements IClientIncomingPacket
} }
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. // Keep other similar shortcuts activated.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
if ((oldShortcut != null) && oldShortcut.isAutoUse()) if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); player.removeAutoShortcut(_slot, _page);
@ -67,21 +68,26 @@ public class RequestShortCutDel implements IClientIncomingPacket
if (oldShortcut.getId() == shortcut.getId()) if (oldShortcut.getId() == shortcut.getId())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
} }
} }
} }
// Remove auto used ids. // Remove auto used ids.
final int id = oldShortcut == null ? -1 : oldShortcut.getId(); if (removed)
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); final int id = oldShortcut == null ? -1 : oldShortcut.getId();
} if (_slot > 263)
else {
{ AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id);
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); }
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); else
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, id);
AutoUseTaskManager.getInstance().removeAutoSkill(player, id);
}
} }
player.restoreAutoShortcutVisual(); player.restoreAutoShortcutVisual();
} }
} }

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

@ -55,10 +55,11 @@ public class RequestShortCutDel implements IClientIncomingPacket
} }
// Delete the shortcut. // Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page); player.deleteShortCut(_slot, _page);
boolean removed = true;
// Keep other similar shortcuts activated. // Keep other similar shortcuts activated.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
if ((oldShortcut != null) && oldShortcut.isAutoUse()) if ((oldShortcut != null) && oldShortcut.isAutoUse())
{ {
player.removeAutoShortcut(_slot, _page); player.removeAutoShortcut(_slot, _page);
@ -67,21 +68,26 @@ public class RequestShortCutDel implements IClientIncomingPacket
if (oldShortcut.getId() == shortcut.getId()) if (oldShortcut.getId() == shortcut.getId())
{ {
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage()); player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
} }
} }
} }
// Remove auto used ids. // Remove auto used ids.
final int id = oldShortcut == null ? -1 : oldShortcut.getId(); if (removed)
if (_slot > 263)
{ {
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id); final int id = oldShortcut == null ? -1 : oldShortcut.getId();
} if (_slot > 263)
else {
{ AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id);
AutoUseTaskManager.getInstance().removeAutoBuff(player, id); }
AutoUseTaskManager.getInstance().removeAutoSkill(player, id); else
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, id);
AutoUseTaskManager.getInstance().removeAutoSkill(player, id);
}
} }
player.restoreAutoShortcutVisual(); player.restoreAutoShortcutVisual();
} }
} }