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

Should remove auto use when adding a new shortcut.

Browse Source 
Contributed by nasseka.
This commit is contained in:
MobiusDevelopment
2022-08-08 22:30:33 +00:00
parent 3520367d06
commit 21507c947f
10 changed files with 530 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut;
import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
public class RequestShortCutReg implements IClientIncomingPacket public class RequestShortCutReg implements IClientIncomingPacket
{ {
@@ -69,6 +70,58 @@ public class RequestShortCutReg implements IClientIncomingPacket
return; return;
} }
// Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page);
if (oldShortcut != null)
{
boolean removed = true;
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{
player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
{
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
}
}
// Remove auto used ids.
if (removed)
{
switch (oldShortcut.getType())
{
case SKILL:
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
if (player.getInventory().getItemByObjectId(oldShortcut.getId()).isPotion())
{
AutoUseTaskManager.getInstance().removeAutoPotionItem(player, oldShortcut.getId());
}
else
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
}
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
}
}
player.restoreAutoShortcutVisual();
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType); final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active); sc.setAutoUse(_active);
player.registerShortCut(sc); player.registerShortCut(sc);

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

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut;
import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
public class RequestShortCutReg implements IClientIncomingPacket public class RequestShortCutReg implements IClientIncomingPacket
{ {
@@ -69,6 +70,58 @@ public class RequestShortCutReg implements IClientIncomingPacket
return; return;
} }
// Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page);
if (oldShortcut != null)
{
boolean removed = true;
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{
player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
{
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
}
}
// Remove auto used ids.
if (removed)
{
switch (oldShortcut.getType())
{
case SKILL:
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
if (player.getInventory().getItemByObjectId(oldShortcut.getId()).isPotion())
{
AutoUseTaskManager.getInstance().removeAutoPotionItem(player, oldShortcut.getId());
}
else
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
}
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
}
}
player.restoreAutoShortcutVisual();
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType); final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active); sc.setAutoUse(_active);
player.registerShortCut(sc); player.registerShortCut(sc);

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

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut;
import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
public class RequestShortCutReg implements IClientIncomingPacket public class RequestShortCutReg implements IClientIncomingPacket
{ {
@@ -69,6 +70,58 @@ public class RequestShortCutReg implements IClientIncomingPacket
return; return;
} }
// Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page);
if (oldShortcut != null)
{
boolean removed = true;
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{
player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
{
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
}
}
// Remove auto used ids.
if (removed)
{
switch (oldShortcut.getType())
{
case SKILL:
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
if (player.getInventory().getItemByObjectId(oldShortcut.getId()).isPotion())
{
AutoUseTaskManager.getInstance().removeAutoPotionItem(player, oldShortcut.getId());
}
else
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
}
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
}
}
player.restoreAutoShortcutVisual();
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType); final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active); sc.setAutoUse(_active);
player.registerShortCut(sc); player.registerShortCut(sc);

53
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut;
import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
public class RequestShortCutReg implements IClientIncomingPacket public class RequestShortCutReg implements IClientIncomingPacket
{ {
@@ -69,6 +70,58 @@ public class RequestShortCutReg implements IClientIncomingPacket
return; return;
} }
// Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page);
if (oldShortcut != null)
{
boolean removed = true;
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{
player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
{
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
}
}
// Remove auto used ids.
if (removed)
{
switch (oldShortcut.getType())
{
case SKILL:
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
if (player.getInventory().getItemByObjectId(oldShortcut.getId()).isPotion())
{
AutoUseTaskManager.getInstance().removeAutoPotionItem(player, oldShortcut.getId());
}
else
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
}
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
}
}
player.restoreAutoShortcutVisual();
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType); final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active); sc.setAutoUse(_active);
player.registerShortCut(sc); player.registerShortCut(sc);

53
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut;
import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
public class RequestShortCutReg implements IClientIncomingPacket public class RequestShortCutReg implements IClientIncomingPacket
{ {
@@ -69,6 +70,58 @@ public class RequestShortCutReg implements IClientIncomingPacket
return; return;
} }
// Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page);
if (oldShortcut != null)
{
boolean removed = true;
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{
player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
{
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
}
}
// Remove auto used ids.
if (removed)
{
switch (oldShortcut.getType())
{
case SKILL:
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
if (player.getInventory().getItemByObjectId(oldShortcut.getId()).isPotion())
{
AutoUseTaskManager.getInstance().removeAutoPotionItem(player, oldShortcut.getId());
}
else
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
}
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
}
}
player.restoreAutoShortcutVisual();
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType); final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active); sc.setAutoUse(_active);
player.registerShortCut(sc); player.registerShortCut(sc);

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

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut;
import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
public class RequestShortCutReg implements IClientIncomingPacket public class RequestShortCutReg implements IClientIncomingPacket
{ {
@@ -69,6 +70,58 @@ public class RequestShortCutReg implements IClientIncomingPacket
return; return;
} }
// Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page);
if (oldShortcut != null)
{
boolean removed = true;
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{
player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
{
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
}
}
// Remove auto used ids.
if (removed)
{
switch (oldShortcut.getType())
{
case SKILL:
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
if (player.getInventory().getItemByObjectId(oldShortcut.getId()).isPotion())
{
AutoUseTaskManager.getInstance().removeAutoPotionItem(player, oldShortcut.getId());
}
else
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
}
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
}
}
player.restoreAutoShortcutVisual();
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType); final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active); sc.setAutoUse(_active);
player.registerShortCut(sc); player.registerShortCut(sc);

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

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut;
import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
public class RequestShortCutReg implements IClientIncomingPacket public class RequestShortCutReg implements IClientIncomingPacket
{ {
@@ -69,6 +70,58 @@ public class RequestShortCutReg implements IClientIncomingPacket
return; return;
} }
// Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page);
if (oldShortcut != null)
{
boolean removed = true;
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{
player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
{
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
}
}
// Remove auto used ids.
if (removed)
{
switch (oldShortcut.getType())
{
case SKILL:
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
if (player.getInventory().getItemByObjectId(oldShortcut.getId()).isPotion())
{
AutoUseTaskManager.getInstance().removeAutoPotionItem(player, oldShortcut.getId());
}
else
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
}
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
}
}
player.restoreAutoShortcutVisual();
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType); final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active); sc.setAutoUse(_active);
player.registerShortCut(sc); player.registerShortCut(sc);

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

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut;
import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
public class RequestShortCutReg implements IClientIncomingPacket public class RequestShortCutReg implements IClientIncomingPacket
{ {
@@ -69,6 +70,58 @@ public class RequestShortCutReg implements IClientIncomingPacket
return; return;
} }
// Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page);
if (oldShortcut != null)
{
boolean removed = true;
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{
player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
{
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
}
}
// Remove auto used ids.
if (removed)
{
switch (oldShortcut.getType())
{
case SKILL:
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
if (player.getInventory().getItemByObjectId(oldShortcut.getId()).isPotion())
{
AutoUseTaskManager.getInstance().removeAutoPotionItem(player, oldShortcut.getId());
}
else
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
}
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
}
}
player.restoreAutoShortcutVisual();
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType); final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active); sc.setAutoUse(_active);
player.registerShortCut(sc); player.registerShortCut(sc);

53
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut;
import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
public class RequestShortCutReg implements IClientIncomingPacket public class RequestShortCutReg implements IClientIncomingPacket
{ {
@@ -69,6 +70,58 @@ public class RequestShortCutReg implements IClientIncomingPacket
return; return;
} }
// Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page);
if (oldShortcut != null)
{
boolean removed = true;
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{
player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
{
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
}
}
// Remove auto used ids.
if (removed)
{
switch (oldShortcut.getType())
{
case SKILL:
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
if (player.getInventory().getItemByObjectId(oldShortcut.getId()).isPotion())
{
AutoUseTaskManager.getInstance().removeAutoPotionItem(player, oldShortcut.getId());
}
else
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
}
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
}
}
player.restoreAutoShortcutVisual();
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType); final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active); sc.setAutoUse(_active);
player.registerShortCut(sc); player.registerShortCut(sc);

53
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut;
import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
public class RequestShortCutReg implements IClientIncomingPacket public class RequestShortCutReg implements IClientIncomingPacket
{ {
@@ -69,6 +70,58 @@ public class RequestShortCutReg implements IClientIncomingPacket
return; return;
} }
// Delete the shortcut.
final Shortcut oldShortcut = player.getShortCut(_slot, _page);
player.deleteShortCut(_slot, _page);
if (oldShortcut != null)
{
boolean removed = true;
// Keep other similar shortcuts activated.
if (oldShortcut.isAutoUse())
{
player.removeAutoShortcut(_slot, _page);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((oldShortcut.getId() == shortcut.getId()) && (oldShortcut.getType() == shortcut.getType()))
{
player.addAutoShortcut(shortcut.getSlot(), shortcut.getPage());
removed = false;
}
}
}
// Remove auto used ids.
if (removed)
{
switch (oldShortcut.getType())
{
case SKILL:
{
AutoUseTaskManager.getInstance().removeAutoBuff(player, oldShortcut.getId());
AutoUseTaskManager.getInstance().removeAutoSkill(player, oldShortcut.getId());
break;
}
case ITEM:
{
if (player.getInventory().getItemByObjectId(oldShortcut.getId()).isPotion())
{
AutoUseTaskManager.getInstance().removeAutoPotionItem(player, oldShortcut.getId());
}
else
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, oldShortcut.getId());
}
break;
}
case ACTION:
{
AutoUseTaskManager.getInstance().removeAutoAction(player, oldShortcut.getId());
break;
}
}
}
}
player.restoreAutoShortcutVisual();
final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType); final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _level, _subLevel, _characterType);
sc.setAutoUse(_active); sc.setAutoUse(_active);
player.registerShortCut(sc); player.registerShortCut(sc);