diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/Character.ini b/L2J_Mobius_1.0_Ertheia/dist/game/config/Character.ini index 00307ad914..ac2ba50732 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/config/Character.ini +++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/Character.ini @@ -725,12 +725,6 @@ TeleportWatchdogTimeout = 0 # Default: 600 PlayerSpawnProtection = 600 -# Spawn protection should disappear with any action with the exception -# of the item usage from items in this list. -# Format: itemId,itemId,itemId,.... -# Default: 0 -PlayerSpawnProtectionAllowedItems = 0 - # Teleport spawn protection time. It will protect the player in the # teleport spawn for the given time. 0 to disable feature PlayerTeleportProtection = 0 diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java index a9a4ce69f5..f1c22953a7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java @@ -267,7 +267,6 @@ public final class Config public static int UNSTUCK_INTERVAL; public static int TELEPORT_WATCHDOG_TIMEOUT; public static int PLAYER_SPAWN_PROTECTION; - public static List SPAWN_PROTECTION_ALLOWED_ITEMS; public static int PLAYER_TELEPORT_PROTECTION; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED; @@ -1720,25 +1719,6 @@ public final class Config UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300); TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0); PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 0); - final String[] items = Character.getString("PlayerSpawnProtectionAllowedItems", "0").split(","); - SPAWN_PROTECTION_ALLOWED_ITEMS = new ArrayList<>(items.length); - for (String item : items) - { - Integer itm = 0; - try - { - itm = Integer.parseInt(item); - } - catch (NumberFormatException nfe) - { - LOGGER.warning("Player Spawn Protection: Wrong ItemId passed: " + item); - LOGGER.warning(nfe.getMessage()); - } - if (itm != 0) - { - SPAWN_PROTECTION_ALLOWED_ITEMS.add(itm); - } - } PLAYER_TELEPORT_PROTECTION = Character.getInt("PlayerTeleportProtection", 0); RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true); OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true); diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/Character.ini b/L2J_Mobius_2.5_Underground/dist/game/config/Character.ini index 96b16f52bb..8bfae275cb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/config/Character.ini +++ b/L2J_Mobius_2.5_Underground/dist/game/config/Character.ini @@ -725,12 +725,6 @@ TeleportWatchdogTimeout = 0 # Default: 600 PlayerSpawnProtection = 600 -# Spawn protection should disappear with any action with the exception -# of the item usage from items in this list. -# Format: itemId,itemId,itemId,.... -# Default: 0 -PlayerSpawnProtectionAllowedItems = 0 - # Teleport spawn protection time. It will protect the player in the # teleport spawn for the given time. 0 to disable feature PlayerTeleportProtection = 0 diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java index be0bc3ab3e..1bfdaa159f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java @@ -273,7 +273,6 @@ public final class Config public static int UNSTUCK_INTERVAL; public static int TELEPORT_WATCHDOG_TIMEOUT; public static int PLAYER_SPAWN_PROTECTION; - public static List SPAWN_PROTECTION_ALLOWED_ITEMS; public static int PLAYER_TELEPORT_PROTECTION; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED; @@ -1735,25 +1734,6 @@ public final class Config UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300); TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0); PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 0); - final String[] items = Character.getString("PlayerSpawnProtectionAllowedItems", "0").split(","); - SPAWN_PROTECTION_ALLOWED_ITEMS = new ArrayList<>(items.length); - for (String item : items) - { - Integer itm = 0; - try - { - itm = Integer.parseInt(item); - } - catch (NumberFormatException nfe) - { - LOGGER.warning("Player Spawn Protection: Wrong ItemId passed: " + item); - LOGGER.warning(nfe.getMessage()); - } - if (itm != 0) - { - SPAWN_PROTECTION_ALLOWED_ITEMS.add(itm); - } - } PLAYER_TELEPORT_PROTECTION = Character.getInt("PlayerTeleportProtection", 0); RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true); OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true); diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/Character.ini b/L2J_Mobius_3.0_Helios/dist/game/config/Character.ini index 96b16f52bb..8bfae275cb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/config/Character.ini +++ b/L2J_Mobius_3.0_Helios/dist/game/config/Character.ini @@ -725,12 +725,6 @@ TeleportWatchdogTimeout = 0 # Default: 600 PlayerSpawnProtection = 600 -# Spawn protection should disappear with any action with the exception -# of the item usage from items in this list. -# Format: itemId,itemId,itemId,.... -# Default: 0 -PlayerSpawnProtectionAllowedItems = 0 - # Teleport spawn protection time. It will protect the player in the # teleport spawn for the given time. 0 to disable feature PlayerTeleportProtection = 0 diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java index 9bcec43843..0a96210769 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java @@ -273,7 +273,6 @@ public final class Config public static int UNSTUCK_INTERVAL; public static int TELEPORT_WATCHDOG_TIMEOUT; public static int PLAYER_SPAWN_PROTECTION; - public static List SPAWN_PROTECTION_ALLOWED_ITEMS; public static int PLAYER_TELEPORT_PROTECTION; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED; @@ -1743,25 +1742,6 @@ public final class Config UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300); TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0); PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 0); - final String[] items = Character.getString("PlayerSpawnProtectionAllowedItems", "0").split(","); - SPAWN_PROTECTION_ALLOWED_ITEMS = new ArrayList<>(items.length); - for (String item : items) - { - Integer itm = 0; - try - { - itm = Integer.parseInt(item); - } - catch (NumberFormatException nfe) - { - LOGGER.warning("Player Spawn Protection: Wrong ItemId passed: " + item); - LOGGER.warning(nfe.getMessage()); - } - if (itm != 0) - { - SPAWN_PROTECTION_ALLOWED_ITEMS.add(itm); - } - } PLAYER_TELEPORT_PROTECTION = Character.getInt("PlayerTeleportProtection", 0); RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true); OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Character.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Character.ini index 6f409dd872..49e3a29a0a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Character.ini +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Character.ini @@ -725,12 +725,6 @@ TeleportWatchdogTimeout = 0 # Default: 600 PlayerSpawnProtection = 600 -# Spawn protection should disappear with any action with the exception -# of the item usage from items in this list. -# Format: itemId,itemId,itemId,.... -# Default: 0 -PlayerSpawnProtectionAllowedItems = 0 - # Teleport spawn protection time. It will protect the player in the # teleport spawn for the given time. 0 to disable feature PlayerTeleportProtection = 0 diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java index a88a75bb5a..3a6bb14c96 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java @@ -273,7 +273,6 @@ public final class Config public static int UNSTUCK_INTERVAL; public static int TELEPORT_WATCHDOG_TIMEOUT; public static int PLAYER_SPAWN_PROTECTION; - public static List SPAWN_PROTECTION_ALLOWED_ITEMS; public static int PLAYER_TELEPORT_PROTECTION; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED; @@ -1742,25 +1741,6 @@ public final class Config UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300); TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0); PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 0); - final String[] items = Character.getString("PlayerSpawnProtectionAllowedItems", "0").split(","); - SPAWN_PROTECTION_ALLOWED_ITEMS = new ArrayList<>(items.length); - for (String item : items) - { - Integer itm = 0; - try - { - itm = Integer.parseInt(item); - } - catch (NumberFormatException nfe) - { - LOGGER.warning("Player Spawn Protection: Wrong ItemId passed: " + item); - LOGGER.warning(nfe.getMessage()); - } - if (itm != 0) - { - SPAWN_PROTECTION_ALLOWED_ITEMS.add(itm); - } - } PLAYER_TELEPORT_PROTECTION = Character.getInt("PlayerTeleportProtection", 0); RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true); OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Character.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Character.ini index 3e73ff2993..47a3cc9e1a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Character.ini +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Character.ini @@ -748,12 +748,6 @@ TeleportWatchdogTimeout = 0 # Default: 600 PlayerSpawnProtection = 600 -# Spawn protection should disappear with any action with the exception -# of the item usage from items in this list. -# Format: itemId,itemId,itemId,.... -# Default: 0 -PlayerSpawnProtectionAllowedItems = 0 - # Teleport spawn protection time. It will protect the player in the # teleport spawn for the given time. 0 to disable feature PlayerTeleportProtection = 30 diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java index 855ace0ef5..c0ce198575 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java @@ -258,7 +258,6 @@ public final class Config public static int UNSTUCK_INTERVAL; public static int TELEPORT_WATCHDOG_TIMEOUT; public static int PLAYER_SPAWN_PROTECTION; - public static List SPAWN_PROTECTION_ALLOWED_ITEMS; public static int PLAYER_TELEPORT_PROTECTION; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED; @@ -1761,24 +1760,6 @@ public final class Config UNSTUCK_INTERVAL = character.getInt("UnstuckInterval", 300); TELEPORT_WATCHDOG_TIMEOUT = character.getInt("TeleportWatchdogTimeout", 0); PLAYER_SPAWN_PROTECTION = character.getInt("PlayerSpawnProtection", 0); - final String[] items = character.getString("PlayerSpawnProtectionAllowedItems", "0").split(","); - SPAWN_PROTECTION_ALLOWED_ITEMS = new ArrayList<>(items.length); - for (String item : items) - { - try - { - if (!item.isEmpty()) - { - SPAWN_PROTECTION_ALLOWED_ITEMS.add(Integer.parseInt(item)); - } - } - catch (NumberFormatException nfe) - { - LOGGER.warning("Player Spawn Protection: Wrong ItemId passed: " + item); - LOGGER.warning(nfe.getMessage()); - } - } - PLAYER_TELEPORT_PROTECTION = character.getInt("PlayerTeleportProtection", 0); RANDOM_RESPAWN_IN_TOWN_ENABLED = character.getBoolean("RandomRespawnInTownEnabled", true); OFFSET_ON_TELEPORT_ENABLED = character.getBoolean("OffsetOnTeleportEnabled", true); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini index 5fb73b9a9a..8c917f4302 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini @@ -678,12 +678,6 @@ TeleportWatchdogTimeout = 0 # Default: 600 PlayerSpawnProtection = 600 -# Spawn protection should disappear with any action with the exception -# of the item usage from items in this list. -# Format: itemId,itemId,itemId,.... -# Default: 0 -PlayerSpawnProtectionAllowedItems = 0 - # Teleport spawn protection time. It will protect the player in the # teleport spawn for the given time. 0 to disable feature PlayerTeleportProtection = 0 diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java index 90ec255fdb..bc03b52a99 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java @@ -272,7 +272,6 @@ public final class Config public static int UNSTUCK_INTERVAL; public static int TELEPORT_WATCHDOG_TIMEOUT; public static int PLAYER_SPAWN_PROTECTION; - public static List SPAWN_PROTECTION_ALLOWED_ITEMS; public static int PLAYER_TELEPORT_PROTECTION; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED; @@ -1666,25 +1665,6 @@ public final class Config UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300); TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0); PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 0); - final String[] items = Character.getString("PlayerSpawnProtectionAllowedItems", "0").split(","); - SPAWN_PROTECTION_ALLOWED_ITEMS = new ArrayList<>(items.length); - for (String item : items) - { - Integer itm = 0; - try - { - itm = Integer.parseInt(item); - } - catch (NumberFormatException nfe) - { - LOGGER.warning("Player Spawn Protection: Wrong ItemId passed: " + item); - LOGGER.warning(nfe.getMessage()); - } - if (itm != 0) - { - SPAWN_PROTECTION_ALLOWED_ITEMS.add(itm); - } - } PLAYER_TELEPORT_PROTECTION = Character.getInt("PlayerTeleportProtection", 0); RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true); OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true); diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/Character.ini b/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/Character.ini index 5fb73b9a9a..8c917f4302 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/Character.ini +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/Character.ini @@ -678,12 +678,6 @@ TeleportWatchdogTimeout = 0 # Default: 600 PlayerSpawnProtection = 600 -# Spawn protection should disappear with any action with the exception -# of the item usage from items in this list. -# Format: itemId,itemId,itemId,.... -# Default: 0 -PlayerSpawnProtectionAllowedItems = 0 - # Teleport spawn protection time. It will protect the player in the # teleport spawn for the given time. 0 to disable feature PlayerTeleportProtection = 0 diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/Config.java index 2f2795b545..27c1cafe79 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/Config.java @@ -272,7 +272,6 @@ public final class Config public static int UNSTUCK_INTERVAL; public static int TELEPORT_WATCHDOG_TIMEOUT; public static int PLAYER_SPAWN_PROTECTION; - public static List SPAWN_PROTECTION_ALLOWED_ITEMS; public static int PLAYER_TELEPORT_PROTECTION; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED; @@ -1670,25 +1669,6 @@ public final class Config UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300); TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0); PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 0); - final String[] items = Character.getString("PlayerSpawnProtectionAllowedItems", "0").split(","); - SPAWN_PROTECTION_ALLOWED_ITEMS = new ArrayList<>(items.length); - for (String item : items) - { - Integer itm = 0; - try - { - itm = Integer.parseInt(item); - } - catch (NumberFormatException nfe) - { - LOGGER.warning("Player Spawn Protection: Wrong ItemId passed: " + item); - LOGGER.warning(nfe.getMessage()); - } - if (itm != 0) - { - SPAWN_PROTECTION_ALLOWED_ITEMS.add(itm); - } - } PLAYER_TELEPORT_PROTECTION = Character.getInt("PlayerTeleportProtection", 0); RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true); OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true);