From ce582aef4afa1307b51714fbeb6d8a08b0091f91 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 4 Jan 2021 12:47:32 +0000 Subject: [PATCH] Addition of AutoUseSettingsHolder isEmpty method. Contributed by AnsS. --- .../gameserver/model/holders/AutoUseSettingsHolder.java | 5 +++++ .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 ++++- .../gameserver/model/holders/AutoUseSettingsHolder.java | 5 +++++ .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 ++++- .../gameserver/model/holders/AutoUseSettingsHolder.java | 5 +++++ .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 ++++- .../gameserver/model/holders/AutoUseSettingsHolder.java | 5 +++++ .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 ++++- 8 files changed, 36 insertions(+), 4 deletions(-) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java index 4a25e54d51..770aa69151 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java @@ -52,4 +52,9 @@ public class AutoUseSettingsHolder { return _autoActions; } + + public boolean isEmpty() + { + return _autoSupplyItems.isEmpty() && _autoPotionItems.isEmpty() && _autoSkills.isEmpty(); + } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 955def137f..dcadd9fc3f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -263,7 +263,10 @@ public class AutoUseTaskManager public void stopAutoUseTask(PlayerInstance player) { - PLAYERS.remove(player); + if (player.getAutoUseSettings().isEmpty() || !player.isOnline() || player.isInOfflineMode()) + { + PLAYERS.remove(player); + } } public void addAutoSupplyItem(PlayerInstance player, int itemId) diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java index 4a25e54d51..770aa69151 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java @@ -52,4 +52,9 @@ public class AutoUseSettingsHolder { return _autoActions; } + + public boolean isEmpty() + { + return _autoSupplyItems.isEmpty() && _autoPotionItems.isEmpty() && _autoSkills.isEmpty(); + } } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 955def137f..dcadd9fc3f 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -263,7 +263,10 @@ public class AutoUseTaskManager public void stopAutoUseTask(PlayerInstance player) { - PLAYERS.remove(player); + if (player.getAutoUseSettings().isEmpty() || !player.isOnline() || player.isInOfflineMode()) + { + PLAYERS.remove(player); + } } public void addAutoSupplyItem(PlayerInstance player, int itemId) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java index 4a25e54d51..770aa69151 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java @@ -52,4 +52,9 @@ public class AutoUseSettingsHolder { return _autoActions; } + + public boolean isEmpty() + { + return _autoSupplyItems.isEmpty() && _autoPotionItems.isEmpty() && _autoSkills.isEmpty(); + } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 955def137f..dcadd9fc3f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -263,7 +263,10 @@ public class AutoUseTaskManager public void stopAutoUseTask(PlayerInstance player) { - PLAYERS.remove(player); + if (player.getAutoUseSettings().isEmpty() || !player.isOnline() || player.isInOfflineMode()) + { + PLAYERS.remove(player); + } } public void addAutoSupplyItem(PlayerInstance player, int itemId) diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java index 4a25e54d51..770aa69151 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java @@ -52,4 +52,9 @@ public class AutoUseSettingsHolder { return _autoActions; } + + public boolean isEmpty() + { + return _autoSupplyItems.isEmpty() && _autoPotionItems.isEmpty() && _autoSkills.isEmpty(); + } } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 955def137f..dcadd9fc3f 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -263,7 +263,10 @@ public class AutoUseTaskManager public void stopAutoUseTask(PlayerInstance player) { - PLAYERS.remove(player); + if (player.getAutoUseSettings().isEmpty() || !player.isOnline() || player.isInOfflineMode()) + { + PLAYERS.remove(player); + } } public void addAutoSupplyItem(PlayerInstance player, int itemId)