From d5b27c22725069222674c60bb6aacb5377c5ddf3 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 12 Jun 2022 22:05:59 +0000 Subject: [PATCH] Moved CLIENT_SETTINGS variable at PlayerVariables. --- .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + .../org/l2jmobius/gameserver/model/ClientSettings.java | 7 +++---- .../gameserver/model/variables/PlayerVariables.java | 1 + 28 files changed, 56 insertions(+), 56 deletions(-) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ClientSettings.java index 9af15f51c5..193fe0e60a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _partyRequestRestrictedFromOthers; private boolean _partyRequestRestrictedFromClan; @@ -40,7 +39,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); _partyRequestRestrictedFromClan = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_CLAN", false); @@ -59,7 +58,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isPartyRequestRestrictedFromOthers() diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 3bb7295d41..3525c3122f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -44,6 +44,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String DAILY_MISSION_COUNT = "DAILY_MISSION_COUNT"; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ClientSettings.java index 9af15f51c5..193fe0e60a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _partyRequestRestrictedFromOthers; private boolean _partyRequestRestrictedFromClan; @@ -40,7 +39,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); _partyRequestRestrictedFromClan = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_CLAN", false); @@ -59,7 +58,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isPartyRequestRestrictedFromOthers() diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 3bb7295d41..3525c3122f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -44,6 +44,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String DAILY_MISSION_COUNT = "DAILY_MISSION_COUNT"; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ClientSettings.java index a781b3c2d2..6e566b1951 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _announceEnabled; private boolean _partyRequestRestrictedFromOthers; @@ -41,7 +40,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _announceEnabled = settings.getBoolean("ANNOUNCE_ENABLED", true); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); @@ -62,7 +61,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isAnnounceEnabled() diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 8be642ecb5..ef74168537 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -44,6 +44,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String DAILY_MISSION_COUNT = "DAILY_MISSION_COUNT"; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ClientSettings.java index a781b3c2d2..6e566b1951 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _announceEnabled; private boolean _partyRequestRestrictedFromOthers; @@ -41,7 +40,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _announceEnabled = settings.getBoolean("ANNOUNCE_ENABLED", true); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); @@ -62,7 +61,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isAnnounceEnabled() diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index b91692eab0..045bce2688 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -44,6 +44,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String DAILY_MISSION_COUNT = "DAILY_MISSION_COUNT"; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ClientSettings.java index a781b3c2d2..6e566b1951 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _announceEnabled; private boolean _partyRequestRestrictedFromOthers; @@ -41,7 +40,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _announceEnabled = settings.getBoolean("ANNOUNCE_ENABLED", true); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); @@ -62,7 +61,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isAnnounceEnabled() diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index e40be28720..e7ed7f79d9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -44,6 +44,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String DAILY_MISSION_COUNT = "DAILY_MISSION_COUNT"; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/ClientSettings.java index a781b3c2d2..6e566b1951 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _announceEnabled; private boolean _partyRequestRestrictedFromOthers; @@ -41,7 +40,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _announceEnabled = settings.getBoolean("ANNOUNCE_ENABLED", true); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); @@ -62,7 +61,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isAnnounceEnabled() diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index e40be28720..e7ed7f79d9 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -44,6 +44,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String DAILY_MISSION_COUNT = "DAILY_MISSION_COUNT"; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/ClientSettings.java index a781b3c2d2..6e566b1951 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _announceEnabled; private boolean _partyRequestRestrictedFromOthers; @@ -41,7 +40,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _announceEnabled = settings.getBoolean("ANNOUNCE_ENABLED", true); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); @@ -62,7 +61,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isAnnounceEnabled() diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index e40be28720..e7ed7f79d9 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -44,6 +44,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String DAILY_MISSION_COUNT = "DAILY_MISSION_COUNT"; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ClientSettings.java index 9af15f51c5..193fe0e60a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _partyRequestRestrictedFromOthers; private boolean _partyRequestRestrictedFromClan; @@ -40,7 +39,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); _partyRequestRestrictedFromClan = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_CLAN", false); @@ -59,7 +58,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isPartyRequestRestrictedFromOthers() diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 30b0f7b9c2..c9285dc5a4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -43,6 +43,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String ABILITY_POINTS_MAIN_CLASS = "ABILITY_POINTS"; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ClientSettings.java index 9af15f51c5..193fe0e60a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _partyRequestRestrictedFromOthers; private boolean _partyRequestRestrictedFromClan; @@ -40,7 +39,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); _partyRequestRestrictedFromClan = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_CLAN", false); @@ -59,7 +58,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isPartyRequestRestrictedFromOthers() diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 30b0f7b9c2..c9285dc5a4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -43,6 +43,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String ABILITY_POINTS_MAIN_CLASS = "ABILITY_POINTS"; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ClientSettings.java index a781b3c2d2..6e566b1951 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _announceEnabled; private boolean _partyRequestRestrictedFromOthers; @@ -41,7 +40,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _announceEnabled = settings.getBoolean("ANNOUNCE_ENABLED", true); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); @@ -62,7 +61,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isAnnounceEnabled() diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 04483a415b..e5cf8ba2f7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -43,6 +43,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String ABILITY_POINTS_MAIN_CLASS = "ABILITY_POINTS"; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ClientSettings.java index a781b3c2d2..6e566b1951 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _announceEnabled; private boolean _partyRequestRestrictedFromOthers; @@ -41,7 +40,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _announceEnabled = settings.getBoolean("ANNOUNCE_ENABLED", true); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); @@ -62,7 +61,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isAnnounceEnabled() diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 031be36db5..e5a2ab3b7b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -43,6 +43,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String ABILITY_POINTS_MAIN_CLASS = "ABILITY_POINTS"; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ClientSettings.java index a781b3c2d2..6e566b1951 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _announceEnabled; private boolean _partyRequestRestrictedFromOthers; @@ -41,7 +40,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _announceEnabled = settings.getBoolean("ANNOUNCE_ENABLED", true); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); @@ -62,7 +61,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isAnnounceEnabled() diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index b002de6fc8..28b69b9409 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -43,6 +43,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String ABILITY_POINTS_MAIN_CLASS = "ABILITY_POINTS"; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/ClientSettings.java index a781b3c2d2..6e566b1951 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _announceEnabled; private boolean _partyRequestRestrictedFromOthers; @@ -41,7 +40,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _announceEnabled = settings.getBoolean("ANNOUNCE_ENABLED", true); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); @@ -62,7 +61,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isAnnounceEnabled() diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 9456d4e658..2e08fc92cb 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -43,6 +43,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String ABILITY_POINTS_MAIN_CLASS = "ABILITY_POINTS"; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/ClientSettings.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/ClientSettings.java index a781b3c2d2..6e566b1951 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/ClientSettings.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/ClientSettings.java @@ -20,14 +20,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.variables.PlayerVariables; /** * @author Index */ public class ClientSettings { - private static final String VARIABLE = "CLIENT_SETTINGS"; - private final Player _player; private boolean _announceEnabled; private boolean _partyRequestRestrictedFromOthers; @@ -41,7 +40,7 @@ public class ClientSettings { _player = player; - final String variable = _player.getVariables().getString(VARIABLE, ""); + final String variable = _player.getVariables().getString(PlayerVariables.CLIENT_SETTINGS, ""); final StatSet settings = variable.isEmpty() ? new StatSet() : new StatSet(Arrays.stream(variable.split(",")).map(entry -> entry.split("=")).collect(Collectors.toMap(entry -> entry[0].replace("{", "").replace(" ", ""), entry -> entry[1].replace("}", "").replace(" ", "")))); _announceEnabled = settings.getBoolean("ANNOUNCE_ENABLED", true); _partyRequestRestrictedFromOthers = settings.getBoolean("PARTY_REQUEST_RESTRICTED_FROM_OTHERS", false); @@ -62,7 +61,7 @@ public class ClientSettings settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_OTHERS", _friendRequestRestrictedFromOthers); settings.set("FRIENDS_REQUEST_RESTRICTED_FROM_CLAN", _friendRequestRestrictedFromClan); settings.set("PARTY_CONTRIBUTION_TYPE", _partyContributionType); - _player.getVariables().set(VARIABLE, settings.getSet()); + _player.getVariables().set(PlayerVariables.CLIENT_SETTINGS, settings.getSet()); } public boolean isAnnounceEnabled() diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java index 46bd289ae0..c6b80c82e8 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java @@ -43,6 +43,7 @@ public class PlayerVariables extends AbstractVariables public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; + public static final String CLIENT_SETTINGS = "CLIENT_SETTINGS"; public static final String ATTENDANCE_DATE = "ATTENDANCE_DATE"; public static final String ATTENDANCE_INDEX = "ATTENDANCE_INDEX"; public static final String ABILITY_POINTS_MAIN_CLASS = "ABILITY_POINTS";