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

Stop auto use task without list checks.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-30 12:22:12 +00:00
parent 178f692d47
commit b8e3b3df0e
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -14099,7 +14099,7 @@ public class PlayerInstance extends Playable
public void stopAutoUseTask() public void stopAutoUseTask()
{ {
if ((_autoUseTask != null) && !_autoUseTask.isCancelled() && !_autoUseTask.isDone() && _autoSupplyItems.isEmpty() && _autoPotionItems.isEmpty() && _autoSkills.isEmpty()) if ((_autoUseTask != null) && !_autoUseTask.isCancelled() && !_autoUseTask.isDone())
{ {
_autoUseTask.cancel(true); _autoUseTask.cancel(true);
_autoUseTask = null; _autoUseTask = null;

11
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/Disconnection.java
View File

@@ -91,6 +91,14 @@ public class Disconnection
_client = getClient(client, player); _client = getClient(client, player);
_player = getActiveChar(client, player); _player = getActiveChar(client, player);
// Stop player tasks.
if (_player != null)
{
_player.stopTimedHuntingZoneTask();
_player.stopAutoPlayTask();
_player.stopAutoUseTask();
}
// Anti Feed // Anti Feed
AntiFeedManager.getInstance().onDisconnect(_client); AntiFeedManager.getInstance().onDisconnect(_client);
@@ -116,9 +124,6 @@ public class Disconnection
{ {
if (_player != null) if (_player != null)
{ {
_player.stopTimedHuntingZoneTask();
_player.stopAutoPlayTask();
_player.stopAutoUseTask();
_player.storeMe(); _player.storeMe();
} }
} }

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -14045,7 +14045,7 @@ public class PlayerInstance extends Playable
public void stopAutoUseTask() public void stopAutoUseTask()
{ {
if ((_autoUseTask != null) && !_autoUseTask.isCancelled() && !_autoUseTask.isDone() && _autoSupplyItems.isEmpty() && _autoPotionItems.isEmpty() && _autoSkills.isEmpty()) if ((_autoUseTask != null) && !_autoUseTask.isCancelled() && !_autoUseTask.isDone())
{ {
_autoUseTask.cancel(true); _autoUseTask.cancel(true);
_autoUseTask = null; _autoUseTask = null;

11
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/Disconnection.java
View File

@@ -91,6 +91,14 @@ public class Disconnection
_client = getClient(client, player); _client = getClient(client, player);
_player = getActiveChar(client, player); _player = getActiveChar(client, player);
// Stop player tasks.
if (_player != null)
{
_player.stopTimedHuntingZoneTask();
_player.stopAutoPlayTask();
_player.stopAutoUseTask();
}
// Anti Feed // Anti Feed
AntiFeedManager.getInstance().onDisconnect(_client); AntiFeedManager.getInstance().onDisconnect(_client);
@@ -116,9 +124,6 @@ public class Disconnection
{ {
if (_player != null) if (_player != null)
{ {
_player.stopTimedHuntingZoneTask();
_player.stopAutoPlayTask();
_player.stopAutoUseTask();
_player.storeMe(); _player.storeMe();
} }
} }