From c12a44b9a50311ae35ae9bc65f7359a57dbf4162 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 17 Nov 2019 22:24:53 +0000 Subject: [PATCH] Removed useless AltOlyRestrictedItems entries. --- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 5 +++-- .../dist/game/data/stats/items/14700-14799.xml | 1 + .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../dist/game/data/stats/items/14700-14799.xml | 1 + .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- .../dist/game/config/Olympiad.ini | 4 ++-- .../java/org/l2jmobius/Config.java | 18 +++++++++++++----- 36 files changed, 258 insertions(+), 119 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/Olympiad.ini b/L2J_Mobius_1.0_Ertheia/dist/game/config/Olympiad.ini index 6018f769ce..5ff680b062 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/Olympiad.ini @@ -125,8 +125,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java index 9fe7441bfa..f34923fec7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java @@ -538,7 +538,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static boolean ALT_OLY_USE_CUSTOM_PERIOD_SETTINGS; @@ -2355,11 +2355,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/Olympiad.ini b/L2J_Mobius_2.5_Underground/dist/game/config/Olympiad.ini index 65b381a1f6..8c4963bfc2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_2.5_Underground/dist/game/config/Olympiad.ini @@ -125,8 +125,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java index 39b56026c3..118735b1be 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java @@ -545,7 +545,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static boolean ALT_OLY_USE_CUSTOM_PERIOD_SETTINGS; @@ -2372,11 +2372,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/Olympiad.ini b/L2J_Mobius_3.0_Helios/dist/game/config/Olympiad.ini index 65b381a1f6..8c4963bfc2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_3.0_Helios/dist/game/config/Olympiad.ini @@ -125,8 +125,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java index 14a9bf5953..751be00a35 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java @@ -545,7 +545,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static boolean ALT_OLY_USE_CUSTOM_PERIOD_SETTINGS; @@ -2386,11 +2386,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Olympiad.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Olympiad.ini index 9830006fac..d85079af0b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Olympiad.ini @@ -111,8 +111,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java index 4d704567eb..3eca47e835 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java @@ -534,7 +534,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static String ALT_OLY_PERIOD; @@ -2361,11 +2361,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/config/Olympiad.ini b/L2J_Mobius_5.0_Salvation/dist/game/config/Olympiad.ini index 9830006fac..d85079af0b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_5.0_Salvation/dist/game/config/Olympiad.ini @@ -111,8 +111,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java index 9652c3bb48..4cdf6a04b4 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java @@ -529,7 +529,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static String ALT_OLY_PERIOD; @@ -2363,11 +2363,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/config/Olympiad.ini b/L2J_Mobius_5.5_EtinasFate/dist/game/config/Olympiad.ini index 9830006fac..d85079af0b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/config/Olympiad.ini @@ -111,8 +111,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java index 9652c3bb48..4cdf6a04b4 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java @@ -529,7 +529,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static String ALT_OLY_PERIOD; @@ -2363,11 +2363,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/config/Olympiad.ini b/L2J_Mobius_6.0_Fafurion/dist/game/config/Olympiad.ini index 9830006fac..d85079af0b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_6.0_Fafurion/dist/game/config/Olympiad.ini @@ -111,8 +111,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java index f91fbfb3ac..420f284379 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java @@ -530,7 +530,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static String ALT_OLY_PERIOD; @@ -2401,11 +2401,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Olympiad.ini b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Olympiad.ini index 9830006fac..d85079af0b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Olympiad.ini @@ -111,8 +111,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java index 05106b338a..6a4b643254 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java @@ -529,7 +529,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static String ALT_OLY_PERIOD; @@ -2403,11 +2403,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Olympiad.ini b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Olympiad.ini index e792b20e1e..0485608e59 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Olympiad.ini @@ -114,8 +114,9 @@ AltOlyShowMonthlyWinners = True AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) -# Default: 0 -AltOlyRestrictedItems = 0 +# Equipped items will be moved to inventory during port. +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/items/14700-14799.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/items/14700-14799.xml index a620ef24dc..382f335ace 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/items/14700-14799.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/items/14700-14799.xml @@ -981,6 +981,7 @@ + diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java index 8a1e4453e6..4bc51c599a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java @@ -603,7 +603,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static byte ALT_OLY_WAIT_TIME; public static boolean ALT_OLY_USE_CUSTOM_PERIOD_SETTINGS; @@ -2475,11 +2475,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getByte("AltOlyWaitTime", (byte) 120); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Olympiad.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Olympiad.ini index f1a89b369f..a1c5b70b66 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Olympiad.ini @@ -129,8 +129,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/items/14700-14799.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/items/14700-14799.xml index e8ba83113b..6be5b1502a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/items/14700-14799.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/items/14700-14799.xml @@ -981,6 +981,7 @@ + diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java index 5a2dc480ad..0d67bb66a5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java @@ -608,7 +608,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static boolean ALT_OLY_USE_CUSTOM_PERIOD_SETTINGS; @@ -2489,11 +2489,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 120); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Olympiad.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Olympiad.ini index d248c88438..cf45813e46 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Olympiad.ini @@ -111,8 +111,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java index 9dfe2d05aa..4dac85b9d2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java @@ -538,7 +538,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static String ALT_OLY_PERIOD; @@ -2272,11 +2272,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Olympiad.ini b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Olympiad.ini index d248c88438..cf45813e46 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Olympiad.ini @@ -111,8 +111,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java index 5e280f94c2..82f6effa13 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java @@ -538,7 +538,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static String ALT_OLY_PERIOD; @@ -2276,11 +2276,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Olympiad.ini b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Olympiad.ini index d248c88438..cf45813e46 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Olympiad.ini @@ -111,8 +111,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java index 5e280f94c2..82f6effa13 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java @@ -538,7 +538,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static String ALT_OLY_PERIOD; @@ -2276,11 +2276,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Olympiad.ini b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Olympiad.ini index d248c88438..cf45813e46 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Olympiad.ini @@ -111,8 +111,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java index 5e280f94c2..82f6effa13 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java @@ -538,7 +538,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static String ALT_OLY_PERIOD; @@ -2276,11 +2276,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Olympiad.ini b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Olympiad.ini index d248c88438..cf45813e46 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Olympiad.ini @@ -111,8 +111,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java index 5e280f94c2..82f6effa13 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java @@ -538,7 +538,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static String ALT_OLY_PERIOD; @@ -2276,11 +2276,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Olympiad.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Olympiad.ini index d248c88438..cf45813e46 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Olympiad.ini @@ -111,8 +111,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java index c8f2174164..9f5a81302c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java @@ -537,7 +537,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static String ALT_OLY_PERIOD; @@ -2274,11 +2274,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/config/Olympiad.ini b/L2J_Mobius_Classic_Interlude/dist/game/config/Olympiad.ini index 9a0f004d7a..c7dd83af3f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_Classic_Interlude/dist/game/config/Olympiad.ini @@ -111,8 +111,8 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350) # Equipped items will be moved to inventory during port. -# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 -AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774 +# Default: +AltOlyRestrictedItems = # Enchant limit for items during Olympiad battles. Disabled = -1. # Default: -1 diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java index 0a3efd7dd5..b1d33ea6d7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java @@ -540,7 +540,7 @@ public class Config public static boolean ALT_OLY_LOG_FIGHTS; public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS; public static boolean ALT_OLY_ANNOUNCE_GAMES; - public static List LIST_OLY_RESTRICTED_ITEMS; + public static List LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(); public static int ALT_OLY_ENCHANT_LIMIT; public static int ALT_OLY_WAIT_TIME; public static String ALT_OLY_PERIOD; @@ -2284,11 +2284,19 @@ public class Config ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false); ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true); ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true); - final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(","); - LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length); - for (String id : olyRestrictedItems) + final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim(); + if (!olyRestrictedItems.isEmpty()) { - LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(","); + LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length); + for (String id : olyRestrictedItemsSplit) + { + LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id)); + } + } + else // In case of reload with removal of all items ids. + { + LIST_OLY_RESTRICTED_ITEMS.clear(); } ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1); ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 60);