Addition of item logger by item id configuration.

Contributed by CostyKiller.
This commit is contained in:
MobiusDevelopment
2022-12-04 06:56:33 +00:00
parent e6456fdef4
commit eaa84b6a67
116 changed files with 754 additions and 290 deletions
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -441,6 +441,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1975,6 +1977,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2274,7 +2283,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2286,7 +2295,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2301,7 +2310,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2313,7 +2322,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3479,7 +3488,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -300,7 +300,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -410,7 +410,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -313,7 +313,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -506,7 +506,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -448,6 +448,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1996,6 +1998,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2298,7 +2307,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2310,7 +2319,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2325,7 +2334,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2337,7 +2346,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3505,7 +3514,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -300,7 +300,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -410,7 +410,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -318,7 +318,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -511,7 +511,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -448,6 +448,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -2009,6 +2011,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2312,7 +2321,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2324,7 +2333,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2339,7 +2348,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2351,7 +2360,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3527,7 +3536,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -300,7 +300,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -410,7 +410,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -318,7 +318,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -511,7 +511,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -442,6 +442,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1989,6 +1991,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2292,7 +2301,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2304,7 +2313,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2319,7 +2328,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2331,7 +2340,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3501,7 +3510,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -300,7 +300,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -410,7 +410,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -318,7 +318,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -511,7 +511,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -441,6 +441,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1998,6 +2000,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2301,7 +2310,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2313,7 +2322,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2328,7 +2337,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2340,7 +2349,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3510,7 +3519,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -301,7 +301,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -411,7 +411,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -325,7 +325,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -518,7 +518,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -441,6 +441,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -2005,6 +2007,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2308,7 +2317,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2320,7 +2329,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2335,7 +2344,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2347,7 +2356,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3522,7 +3531,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -303,7 +303,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -413,7 +413,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -325,7 +325,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -518,7 +518,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -442,6 +442,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -2044,6 +2046,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2347,7 +2356,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2359,7 +2368,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2374,7 +2383,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2386,7 +2395,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3565,7 +3574,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -303,7 +303,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -413,7 +413,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -325,7 +325,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -518,7 +518,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -442,6 +442,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -2054,6 +2056,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2363,7 +2372,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2375,7 +2384,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2390,7 +2399,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2402,7 +2411,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3581,7 +3590,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -303,7 +303,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -413,7 +413,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -325,7 +325,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -518,7 +518,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -435,6 +435,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -2033,6 +2035,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2339,7 +2348,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2351,7 +2360,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2366,7 +2375,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2378,7 +2387,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3556,7 +3565,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -315,7 +315,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -425,7 +425,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -325,7 +325,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -518,7 +518,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -435,6 +435,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -2069,6 +2071,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2375,7 +2384,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2387,7 +2396,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2402,7 +2411,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2414,7 +2423,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3560,7 +3569,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -315,7 +315,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -425,7 +425,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -325,7 +325,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -518,7 +518,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 48472 (Einhasad's Golden Coin)
LogItemsIdsList = 48472
# Default: False
LogItemEnchants = False
@@ -435,6 +435,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -2070,6 +2072,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2376,7 +2385,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2388,7 +2397,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2403,7 +2412,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2415,7 +2424,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3562,7 +3571,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -315,7 +315,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -425,7 +425,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -324,7 +324,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -517,7 +517,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 48472 (Einhasad's Golden Coin)
LogItemsIdsList = 48472
# Default: False
LogItemEnchants = False
@@ -437,6 +437,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -2105,6 +2107,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2411,7 +2420,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2423,7 +2432,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2438,7 +2447,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2450,7 +2459,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3604,7 +3613,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -315,7 +315,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -425,7 +425,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -325,7 +325,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -518,7 +518,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -107,9 +107,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -488,6 +488,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1962,6 +1964,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2275,7 +2284,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2287,7 +2296,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2302,7 +2311,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2314,7 +2323,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2940,7 +2949,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -292,7 +292,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -402,7 +402,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -291,7 +291,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -484,7 +484,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -107,9 +107,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -496,6 +496,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -2027,6 +2029,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2371,7 +2380,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2383,7 +2392,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2398,7 +2407,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2410,7 +2419,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3058,7 +3067,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -298,7 +298,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -408,7 +408,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -294,7 +294,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -487,7 +487,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -107,9 +107,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -501,6 +501,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -2032,6 +2034,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2376,7 +2385,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2388,7 +2397,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2403,7 +2412,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2415,7 +2424,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3065,7 +3074,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -298,7 +298,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -408,7 +408,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -294,7 +294,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -487,7 +487,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -453,6 +453,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1908,6 +1910,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2204,7 +2213,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2216,7 +2225,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2231,7 +2240,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2243,7 +2252,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3365,7 +3374,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -300,7 +300,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -410,7 +410,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -313,7 +313,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -506,7 +506,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -463,6 +463,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1937,6 +1939,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2233,7 +2242,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2245,7 +2254,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2260,7 +2269,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2272,7 +2281,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3411,7 +3420,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -300,7 +300,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -410,7 +410,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -313,7 +313,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -506,7 +506,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -463,6 +463,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1940,6 +1942,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2239,7 +2248,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2251,7 +2260,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2266,7 +2275,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2278,7 +2287,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3417,7 +3426,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -300,7 +300,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -410,7 +410,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -318,7 +318,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -511,7 +511,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -463,6 +463,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1944,6 +1946,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2243,7 +2252,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2255,7 +2264,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2270,7 +2279,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2282,7 +2291,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3423,7 +3432,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -300,7 +300,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -410,7 +410,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -318,7 +318,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -511,7 +511,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -463,6 +463,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1944,6 +1946,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2243,7 +2252,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2255,7 +2264,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2270,7 +2279,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2282,7 +2291,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3423,7 +3432,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -301,7 +301,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -411,7 +411,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -322,7 +322,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -515,7 +515,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -463,6 +463,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1944,6 +1946,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2243,7 +2252,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2255,7 +2264,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2270,7 +2279,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2282,7 +2291,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3423,7 +3432,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -303,7 +303,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -413,7 +413,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -322,7 +322,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -515,7 +515,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -464,6 +464,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1995,6 +1997,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2299,7 +2308,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2311,7 +2320,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2326,7 +2335,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2338,7 +2347,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3446,7 +3455,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -303,7 +303,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -413,7 +413,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -322,7 +322,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -515,7 +515,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -463,6 +463,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1953,6 +1955,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2252,7 +2261,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2264,7 +2273,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2279,7 +2288,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2291,7 +2300,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3432,7 +3441,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -303,7 +303,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -413,7 +413,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -322,7 +322,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -515,7 +515,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -463,6 +463,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1994,6 +1996,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2298,7 +2307,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2310,7 +2319,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2325,7 +2334,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2337,7 +2346,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3446,7 +3455,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -303,7 +303,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -413,7 +413,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -322,7 +322,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -515,7 +515,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
+8 -1
View File
@@ -103,9 +103,16 @@ LogAutoAnnouncements = False
# Default: False
LogItems = False
# Log only Adena and equippable items if LogItems is enabled
# Log only Adena and equippable items if LogItems is enabled.
LogItemsSmallLog = False
# Log only item ids specified if LogItems is enabled.
LogItemsIdsOnly = False
# Log only item ids specified here, separated by commas.
# Default: 4356 (Gold Einhasad)
LogItemsIdsList = 4356
# Default: False
LogItemEnchants = False
@@ -463,6 +463,8 @@ public class Config
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
public static boolean LOG_ITEMS_SMALL_LOG;
public static boolean LOG_ITEMS_IDS_ONLY;
public static Set<Integer> LOG_ITEMS_IDS_LIST;
public static boolean LOG_ITEM_ENCHANTS;
public static boolean LOG_SKILL_ENCHANTS;
public static boolean GMAUDIT;
@@ -1948,6 +1950,13 @@ public class Config
LOG_AUTO_ANNOUNCEMENTS = generalConfig.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = generalConfig.getBoolean("LogItems", false);
LOG_ITEMS_SMALL_LOG = generalConfig.getBoolean("LogItemsSmallLog", false);
LOG_ITEMS_IDS_ONLY = generalConfig.getBoolean("LogItemsIdsOnly", false);
final String[] splitItemIds = generalConfig.getString("LogItemsIdsList", "0").split(",");
LOG_ITEMS_IDS_LIST = new HashSet<>(splitItemIds.length);
for (String id : splitItemIds)
{
LOG_ITEMS_IDS_LIST.add(Integer.parseInt(id));
}
LOG_ITEM_ENCHANTS = generalConfig.getBoolean("LogItemEnchants", false);
LOG_SKILL_ENCHANTS = generalConfig.getBoolean("LogSkillEnchants", false);
GMAUDIT = generalConfig.getBoolean("GMAudit", false);
@@ -2254,7 +2263,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2266,7 +2275,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropAmountMultiplierByItemId \"", item, "\""));
}
}
}
@@ -2281,7 +2290,7 @@ public class Config
final String[] itemSplit = item.split(",");
if (itemSplit.length != 2)
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
else
{
@@ -2293,7 +2302,7 @@ public class Config
{
if (!item.isEmpty())
{
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> RateDropItemsById \"", item, "\""));
LOGGER.warning(StringUtil.concat("Config.load(): invalid config property -> DropChanceMultiplierByItemId \"", item, "\""));
}
}
}
@@ -3420,7 +3429,7 @@ public class Config
DISABLE_REWARDS_IN_INSTANCES = pvpRewardItemConfig.getBoolean("DisableRewardsInInstances", true);
DISABLE_REWARDS_IN_PVP_ZONES = pvpRewardItemConfig.getBoolean("DisableRewardsInPvpZones", true);
// Load PvpRewardItem config file (if exists)
// Load PvpTitle config file (if exists)
final PropertiesParser pvpTitleColorConfig = new PropertiesParser(CUSTOM_PVP_TITLE_CONFIG_FILE);
PVP_COLOR_SYSTEM_ENABLED = pvpTitleColorConfig.getBoolean("EnablePvPColorSystem", false);
PVP_AMOUNT1 = pvpTitleColorConfig.getInt("PvpAmount1", 500);
@@ -300,7 +300,7 @@ public class ItemTable
item.setCount(count);
}
if (Config.LOG_ITEMS && !process.equals("Reset") && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && !process.equals("Reset") && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -410,7 +410,7 @@ public class ItemTable
World.getInstance().removeObject(item);
IdManager.getInstance().releaseId(item.getObjectId());
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(item.getId())))
{
if (item.getEnchantLevel() > 0)
{
@@ -313,7 +313,7 @@ public class Item extends WorldObject
{
setOwnerId(ownerId);
if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{
@@ -506,7 +506,7 @@ public class Item extends WorldObject
_storedInDb = false;
if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))))
if ((Config.LOG_ITEMS && (process != null) && ((!Config.LOG_ITEMS_SMALL_LOG) && (!Config.LOG_ITEMS_IDS_ONLY))) || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))) || (Config.LOG_ITEMS_IDS_ONLY && Config.LOG_ITEMS_IDS_LIST.contains(_itemTemplate.getId())))
{
if (_enchantLevel > 0)
{

Some files were not shown because too many files have changed in this diff Show More