Removed unused PlayerSpawnProtectionAllowedItems config.

This commit is contained in:
MobiusDev 2018-04-05 16:37:06 +00:00
parent d21bdcbcea
commit 26c61b855f
14 changed files with 0 additions and 181 deletions

View File

@ -725,12 +725,6 @@ TeleportWatchdogTimeout = 0
# Default: 600 # Default: 600
PlayerSpawnProtection = 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 protection time. It will protect the player in the
# teleport spawn for the given time. 0 to disable feature # teleport spawn for the given time. 0 to disable feature
PlayerTeleportProtection = 0 PlayerTeleportProtection = 0

View File

@ -267,7 +267,6 @@ public final class Config
public static int UNSTUCK_INTERVAL; public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT; public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION; public static int PLAYER_SPAWN_PROTECTION;
public static List<Integer> SPAWN_PROTECTION_ALLOWED_ITEMS;
public static int PLAYER_TELEPORT_PROTECTION; public static int PLAYER_TELEPORT_PROTECTION;
public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED;
public static boolean OFFSET_ON_TELEPORT_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED;
@ -1720,25 +1719,6 @@ public final class Config
UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300); UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0); TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 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); PLAYER_TELEPORT_PROTECTION = Character.getInt("PlayerTeleportProtection", 0);
RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true); RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true);
OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true); OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true);

View File

@ -725,12 +725,6 @@ TeleportWatchdogTimeout = 0
# Default: 600 # Default: 600
PlayerSpawnProtection = 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 protection time. It will protect the player in the
# teleport spawn for the given time. 0 to disable feature # teleport spawn for the given time. 0 to disable feature
PlayerTeleportProtection = 0 PlayerTeleportProtection = 0

View File

@ -273,7 +273,6 @@ public final class Config
public static int UNSTUCK_INTERVAL; public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT; public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION; public static int PLAYER_SPAWN_PROTECTION;
public static List<Integer> SPAWN_PROTECTION_ALLOWED_ITEMS;
public static int PLAYER_TELEPORT_PROTECTION; public static int PLAYER_TELEPORT_PROTECTION;
public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED;
public static boolean OFFSET_ON_TELEPORT_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED;
@ -1735,25 +1734,6 @@ public final class Config
UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300); UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0); TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 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); PLAYER_TELEPORT_PROTECTION = Character.getInt("PlayerTeleportProtection", 0);
RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true); RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true);
OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true); OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true);

View File

@ -725,12 +725,6 @@ TeleportWatchdogTimeout = 0
# Default: 600 # Default: 600
PlayerSpawnProtection = 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 protection time. It will protect the player in the
# teleport spawn for the given time. 0 to disable feature # teleport spawn for the given time. 0 to disable feature
PlayerTeleportProtection = 0 PlayerTeleportProtection = 0

View File

@ -273,7 +273,6 @@ public final class Config
public static int UNSTUCK_INTERVAL; public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT; public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION; public static int PLAYER_SPAWN_PROTECTION;
public static List<Integer> SPAWN_PROTECTION_ALLOWED_ITEMS;
public static int PLAYER_TELEPORT_PROTECTION; public static int PLAYER_TELEPORT_PROTECTION;
public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED;
public static boolean OFFSET_ON_TELEPORT_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED;
@ -1743,25 +1742,6 @@ public final class Config
UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300); UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0); TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 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); PLAYER_TELEPORT_PROTECTION = Character.getInt("PlayerTeleportProtection", 0);
RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true); RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true);
OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true); OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true);

View File

@ -725,12 +725,6 @@ TeleportWatchdogTimeout = 0
# Default: 600 # Default: 600
PlayerSpawnProtection = 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 protection time. It will protect the player in the
# teleport spawn for the given time. 0 to disable feature # teleport spawn for the given time. 0 to disable feature
PlayerTeleportProtection = 0 PlayerTeleportProtection = 0

View File

@ -273,7 +273,6 @@ public final class Config
public static int UNSTUCK_INTERVAL; public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT; public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION; public static int PLAYER_SPAWN_PROTECTION;
public static List<Integer> SPAWN_PROTECTION_ALLOWED_ITEMS;
public static int PLAYER_TELEPORT_PROTECTION; public static int PLAYER_TELEPORT_PROTECTION;
public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED;
public static boolean OFFSET_ON_TELEPORT_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED;
@ -1742,25 +1741,6 @@ public final class Config
UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300); UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0); TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 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); PLAYER_TELEPORT_PROTECTION = Character.getInt("PlayerTeleportProtection", 0);
RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true); RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true);
OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true); OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true);

View File

@ -748,12 +748,6 @@ TeleportWatchdogTimeout = 0
# Default: 600 # Default: 600
PlayerSpawnProtection = 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 protection time. It will protect the player in the
# teleport spawn for the given time. 0 to disable feature # teleport spawn for the given time. 0 to disable feature
PlayerTeleportProtection = 30 PlayerTeleportProtection = 30

View File

@ -258,7 +258,6 @@ public final class Config
public static int UNSTUCK_INTERVAL; public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT; public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION; public static int PLAYER_SPAWN_PROTECTION;
public static List<Integer> SPAWN_PROTECTION_ALLOWED_ITEMS;
public static int PLAYER_TELEPORT_PROTECTION; public static int PLAYER_TELEPORT_PROTECTION;
public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED;
public static boolean OFFSET_ON_TELEPORT_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED;
@ -1761,24 +1760,6 @@ public final class Config
UNSTUCK_INTERVAL = character.getInt("UnstuckInterval", 300); UNSTUCK_INTERVAL = character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = character.getInt("TeleportWatchdogTimeout", 0); TELEPORT_WATCHDOG_TIMEOUT = character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = character.getInt("PlayerSpawnProtection", 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); PLAYER_TELEPORT_PROTECTION = character.getInt("PlayerTeleportProtection", 0);
RANDOM_RESPAWN_IN_TOWN_ENABLED = character.getBoolean("RandomRespawnInTownEnabled", true); RANDOM_RESPAWN_IN_TOWN_ENABLED = character.getBoolean("RandomRespawnInTownEnabled", true);
OFFSET_ON_TELEPORT_ENABLED = character.getBoolean("OffsetOnTeleportEnabled", true); OFFSET_ON_TELEPORT_ENABLED = character.getBoolean("OffsetOnTeleportEnabled", true);

View File

@ -678,12 +678,6 @@ TeleportWatchdogTimeout = 0
# Default: 600 # Default: 600
PlayerSpawnProtection = 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 protection time. It will protect the player in the
# teleport spawn for the given time. 0 to disable feature # teleport spawn for the given time. 0 to disable feature
PlayerTeleportProtection = 0 PlayerTeleportProtection = 0

View File

@ -272,7 +272,6 @@ public final class Config
public static int UNSTUCK_INTERVAL; public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT; public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION; public static int PLAYER_SPAWN_PROTECTION;
public static List<Integer> SPAWN_PROTECTION_ALLOWED_ITEMS;
public static int PLAYER_TELEPORT_PROTECTION; public static int PLAYER_TELEPORT_PROTECTION;
public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED;
public static boolean OFFSET_ON_TELEPORT_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED;
@ -1666,25 +1665,6 @@ public final class Config
UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300); UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0); TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 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); PLAYER_TELEPORT_PROTECTION = Character.getInt("PlayerTeleportProtection", 0);
RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true); RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true);
OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true); OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true);

View File

@ -678,12 +678,6 @@ TeleportWatchdogTimeout = 0
# Default: 600 # Default: 600
PlayerSpawnProtection = 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 protection time. It will protect the player in the
# teleport spawn for the given time. 0 to disable feature # teleport spawn for the given time. 0 to disable feature
PlayerTeleportProtection = 0 PlayerTeleportProtection = 0

View File

@ -272,7 +272,6 @@ public final class Config
public static int UNSTUCK_INTERVAL; public static int UNSTUCK_INTERVAL;
public static int TELEPORT_WATCHDOG_TIMEOUT; public static int TELEPORT_WATCHDOG_TIMEOUT;
public static int PLAYER_SPAWN_PROTECTION; public static int PLAYER_SPAWN_PROTECTION;
public static List<Integer> SPAWN_PROTECTION_ALLOWED_ITEMS;
public static int PLAYER_TELEPORT_PROTECTION; public static int PLAYER_TELEPORT_PROTECTION;
public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED; public static boolean RANDOM_RESPAWN_IN_TOWN_ENABLED;
public static boolean OFFSET_ON_TELEPORT_ENABLED; public static boolean OFFSET_ON_TELEPORT_ENABLED;
@ -1670,25 +1669,6 @@ public final class Config
UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300); UNSTUCK_INTERVAL = Character.getInt("UnstuckInterval", 300);
TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0); TELEPORT_WATCHDOG_TIMEOUT = Character.getInt("TeleportWatchdogTimeout", 0);
PLAYER_SPAWN_PROTECTION = Character.getInt("PlayerSpawnProtection", 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); PLAYER_TELEPORT_PROTECTION = Character.getInt("PlayerTeleportProtection", 0);
RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true); RANDOM_RESPAWN_IN_TOWN_ENABLED = Character.getBoolean("RandomRespawnInTownEnabled", true);
OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true); OFFSET_ON_TELEPORT_ENABLED = Character.getBoolean("OffsetOnTeleportEnabled", true);