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

Fixed autouse stop when learn skill or moving shortcuts.

Browse Source 
Contributed by Serenitty.
This commit is contained in:
MobiusDevelopment
2021-09-16 21:54:00 +00:00
parent 925709a804
commit 7da17cc9a3
18 changed files with 210 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -352,6 +352,7 @@ import org.l2jmobius.gameserver.network.serverpackets.TradeOtherDone;
import org.l2jmobius.gameserver.network.serverpackets.TradeStart;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExActivateAutoShortcut;
import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlaySettingSend;
import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionInfo;
import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
@@ -14367,6 +14368,36 @@ public class PlayerInstance extends Playable
return _autoUseSettings;
}
public void restoreVisualAutoUse()
{
if (_autoUseSettings.isEmpty())
{
return;
}
Shortcut shortcut;
for (int i = 0; i < 12; i++)
{
shortcut = getShortCut(i, 22);
if ((shortcut != null) && _autoUseSettings.getAutoSupplyItems().contains(shortcut.getId()) && (getInventory().getItemByObjectId(shortcut.getId()) != null))
{
sendPacket(new ExActivateAutoShortcut((22 * 12) + i, true));
}
}
for (int i = 0; i < 21; i++)
{
for (int j = 0; j < 12; j++)
{
shortcut = getShortCut(j, i);
if ((shortcut != null) && _autoUseSettings.getAutoSkills().contains(shortcut.getId()) && (getKnownSkill(shortcut.getId()) != null))
{
sendPacket(new ExActivateAutoShortcut(j + (i * 12), true));
}
}
}
}
public boolean isInTimedHuntingZone(int zoneId)
{
return isInTimedHuntingZone(zoneId, getX(), getY());

1
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -666,6 +666,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
{
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerSkillLearn(trainer, player, skill, _skillType), player);
}
player.restoreVisualAutoUse();
}
/**

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

@@ -49,7 +49,7 @@ public class RequestShortCutDel implements IClientIncomingPacket
return;
}
if ((_page > 23) || (_page < 0))
if ((_page > 23) || (_page < 1))
{
return;
}
@@ -65,10 +65,12 @@ public class RequestShortCutDel implements IClientIncomingPacket
if (_slot > 263)
{
AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, id);
player.restoreVisualAutoUse();
}
else
{
AutoUseTaskManager.getInstance().removeAutoSkill(player, id);
player.restoreVisualAutoUse();
}
}
}