From c8659d9da85c617798bdb21e50938f9bbc991338 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 19 Sep 2021 23:19:03 +0000 Subject: [PATCH] Simplified auto use restore method active value. --- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f38b2ccea6..b717570fcb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14323,7 +14323,7 @@ public class PlayerInstance extends Playable } final int options = settings.get(0); - final boolean active = Config.RESUME_AUTO_PLAY ? settings.get(1) == 1 : false; + final boolean active = Config.RESUME_AUTO_PLAY && (settings.get(1) == 1); final boolean pickUp = settings.get(2) == 1; final int nextTargetMode = settings.get(3); final boolean longRange = settings.get(4) == 1; diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 3d4e538d3c..1cb04bde88 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14393,7 +14393,7 @@ public class PlayerInstance extends Playable } final int options = settings.get(0); - final boolean active = Config.RESUME_AUTO_PLAY ? settings.get(1) == 1 : false; + final boolean active = Config.RESUME_AUTO_PLAY && (settings.get(1) == 1); final boolean pickUp = settings.get(2) == 1; final int nextTargetMode = settings.get(3); final boolean longRange = settings.get(4) == 1; diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index a060198061..6fa385a526 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14430,7 +14430,7 @@ public class PlayerInstance extends Playable } final int options = settings.get(0); - final boolean active = Config.RESUME_AUTO_PLAY ? settings.get(1) == 1 : false; + final boolean active = Config.RESUME_AUTO_PLAY && (settings.get(1) == 1); final boolean pickUp = settings.get(2) == 1; final int nextTargetMode = settings.get(3); final boolean longRange = settings.get(4) == 1; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7a83c1fee6..011ecf5bc8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14303,7 +14303,7 @@ public class PlayerInstance extends Playable } final int options = settings.get(0); - final boolean active = Config.RESUME_AUTO_PLAY ? settings.get(1) == 1 : false; + final boolean active = Config.RESUME_AUTO_PLAY && (settings.get(1) == 1); final boolean pickUp = settings.get(2) == 1; final int nextTargetMode = settings.get(3); final boolean longRange = settings.get(4) == 1; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 9b3aa7fb8c..77c1ccb92d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14563,7 +14563,7 @@ public class PlayerInstance extends Playable } final int options = settings.get(0); - final boolean active = Config.RESUME_AUTO_PLAY ? settings.get(1) == 1 : false; + final boolean active = Config.RESUME_AUTO_PLAY && (settings.get(1) == 1); final boolean pickUp = settings.get(2) == 1; final int nextTargetMode = settings.get(3); final boolean longRange = settings.get(4) == 1; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 47e154367e..bae38bd0c7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -14640,7 +14640,7 @@ public class PlayerInstance extends Playable } final int options = settings.get(0); - final boolean active = Config.RESUME_AUTO_PLAY ? settings.get(1) == 1 : false; + final boolean active = Config.RESUME_AUTO_PLAY && (settings.get(1) == 1); final boolean pickUp = settings.get(2) == 1; final int nextTargetMode = settings.get(3); final boolean longRange = settings.get(4) == 1;