diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java index 34ee28cf47..1eff6ad979 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -299,29 +300,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -339,14 +354,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -391,31 +410,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/ItemTable.java index 34ee28cf47..1eff6ad979 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -299,29 +300,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -339,14 +354,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -391,31 +410,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/ItemTable.java index 34ee28cf47..1eff6ad979 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -299,29 +300,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -339,14 +354,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -391,31 +410,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/ItemTable.java index 34ee28cf47..1eff6ad979 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -299,29 +300,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -339,14 +354,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -391,31 +410,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/ItemTable.java index 0eb95f653d..4681aa9c0a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -300,29 +301,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -340,14 +355,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -392,31 +411,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/ItemTable.java index 038abf3f97..c1d6d84612 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -302,29 +303,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -342,14 +357,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -394,31 +413,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/ItemTable.java index 038abf3f97..c1d6d84612 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -302,29 +303,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -342,14 +357,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -394,31 +413,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java index 038abf3f97..c1d6d84612 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -302,29 +303,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -342,14 +357,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -394,31 +413,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java index b529270079..19449a60ed 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -314,29 +315,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -354,14 +369,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -406,31 +425,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/ItemTable.java index b529270079..19449a60ed 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -314,29 +315,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -354,14 +369,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -406,31 +425,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/ItemTable.java index b529270079..19449a60ed 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -314,29 +315,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -354,14 +369,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -406,31 +425,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java index 5c0998c42d..3ee8a6a4e6 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -64,6 +65,12 @@ public class ItemTable private static final Logger LOGGER = Logger.getLogger(ItemTable.class.getName()); private static final Logger LOGGER_ITEMS = Logger.getLogger("item"); + private ItemTemplate[] _allTemplates; + private final Map _etcItems = new HashMap<>(); + private final Map _armors = new HashMap<>(); + private final Map _weapons = new HashMap<>(); + private final List _itemFiles = new ArrayList<>(); + public static final Map SLOTS = new HashMap<>(); static { @@ -91,17 +98,13 @@ public class ItemTable SLOTS.put("strider", ItemTemplate.SLOT_STRIDER); SLOTS.put("babypet", ItemTemplate.SLOT_BABYPET); SLOTS.put("none", ItemTemplate.SLOT_NONE); + // retail compatibility SLOTS.put("onepiece", ItemTemplate.SLOT_FULL_ARMOR); SLOTS.put("hair2", ItemTemplate.SLOT_HAIR2); SLOTS.put("dhair", ItemTemplate.SLOT_HAIRALL); SLOTS.put("alldress", ItemTemplate.SLOT_ALLDRESS); } - private ItemTemplate[] _allTemplates; - private final Map _etcItems = new HashMap<>(); - private final Map _armors = new HashMap<>(); - private final Map _weapons = new HashMap<>(); - private final List _itemFiles = new ArrayList<>(); protected ItemTable() { @@ -129,11 +132,7 @@ public class ItemTable } } - /** - * Return created items - * @return List of {@link ItemTemplate} - */ - public Collection loadItems() + private Collection loadItems() { final Collection list = ConcurrentHashMap.newKeySet(); if (Config.THREADS_FOR_LOADING) @@ -297,22 +296,39 @@ public class ItemTable { if (item.getEnchantLevel() > 0) { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } else { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -330,14 +346,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -382,31 +402,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/ItemTable.java index 9794eaa56c..6c3569e88e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -64,6 +65,12 @@ public class ItemTable private static final Logger LOGGER = Logger.getLogger(ItemTable.class.getName()); private static final Logger LOGGER_ITEMS = Logger.getLogger("item"); + private ItemTemplate[] _allTemplates; + private final Map _etcItems = new HashMap<>(); + private final Map _armors = new HashMap<>(); + private final Map _weapons = new HashMap<>(); + private final List _itemFiles = new ArrayList<>(); + public static final Map SLOTS = new HashMap<>(); static { @@ -95,6 +102,7 @@ public class ItemTable SLOTS.put("strider", ItemTemplate.SLOT_STRIDER); SLOTS.put("babypet", ItemTemplate.SLOT_BABYPET); SLOTS.put("none", ItemTemplate.SLOT_NONE); + // retail compatibility SLOTS.put("onepiece", ItemTemplate.SLOT_FULL_ARMOR); SLOTS.put("hair2", ItemTemplate.SLOT_HAIR2); @@ -103,11 +111,6 @@ public class ItemTable SLOTS.put("deco1", ItemTemplate.SLOT_DECO); SLOTS.put("waist", ItemTemplate.SLOT_BELT); } - private ItemTemplate[] _allTemplates; - private final Map _etcItems = new HashMap<>(); - private final Map _armors = new HashMap<>(); - private final Map _weapons = new HashMap<>(); - private final List _itemFiles = new ArrayList<>(); protected ItemTable() { @@ -135,11 +138,7 @@ public class ItemTable } } - /** - * Return created items - * @return List of {@link ItemTemplate} - */ - public Collection loadItems() + private Collection loadItems() { final Collection list = ConcurrentHashMap.newKeySet(); if (Config.THREADS_FOR_LOADING) @@ -303,22 +302,39 @@ public class ItemTable { if (item.getEnchantLevel() > 0) { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } else { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -336,14 +352,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -388,31 +408,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/ItemTable.java index 9794eaa56c..6c3569e88e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -64,6 +65,12 @@ public class ItemTable private static final Logger LOGGER = Logger.getLogger(ItemTable.class.getName()); private static final Logger LOGGER_ITEMS = Logger.getLogger("item"); + private ItemTemplate[] _allTemplates; + private final Map _etcItems = new HashMap<>(); + private final Map _armors = new HashMap<>(); + private final Map _weapons = new HashMap<>(); + private final List _itemFiles = new ArrayList<>(); + public static final Map SLOTS = new HashMap<>(); static { @@ -95,6 +102,7 @@ public class ItemTable SLOTS.put("strider", ItemTemplate.SLOT_STRIDER); SLOTS.put("babypet", ItemTemplate.SLOT_BABYPET); SLOTS.put("none", ItemTemplate.SLOT_NONE); + // retail compatibility SLOTS.put("onepiece", ItemTemplate.SLOT_FULL_ARMOR); SLOTS.put("hair2", ItemTemplate.SLOT_HAIR2); @@ -103,11 +111,6 @@ public class ItemTable SLOTS.put("deco1", ItemTemplate.SLOT_DECO); SLOTS.put("waist", ItemTemplate.SLOT_BELT); } - private ItemTemplate[] _allTemplates; - private final Map _etcItems = new HashMap<>(); - private final Map _armors = new HashMap<>(); - private final Map _weapons = new HashMap<>(); - private final List _itemFiles = new ArrayList<>(); protected ItemTable() { @@ -135,11 +138,7 @@ public class ItemTable } } - /** - * Return created items - * @return List of {@link ItemTemplate} - */ - public Collection loadItems() + private Collection loadItems() { final Collection list = ConcurrentHashMap.newKeySet(); if (Config.THREADS_FOR_LOADING) @@ -303,22 +302,39 @@ public class ItemTable { if (item.getEnchantLevel() > 0) { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } else { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -336,14 +352,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -388,31 +408,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/ItemTable.java index 34ee28cf47..1eff6ad979 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -299,29 +300,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -339,14 +354,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -391,31 +410,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/ItemTable.java index 34ee28cf47..1eff6ad979 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -299,29 +300,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -339,14 +354,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -391,31 +410,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java index 34ee28cf47..1eff6ad979 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -299,29 +300,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -339,14 +354,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -391,31 +410,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/ItemTable.java index 34ee28cf47..1eff6ad979 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -299,29 +300,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -339,14 +354,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -391,31 +410,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/ItemTable.java index 0eb95f653d..4681aa9c0a 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -300,29 +301,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -340,14 +355,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -392,31 +411,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/ItemTable.java index 038abf3f97..c1d6d84612 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -302,29 +303,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -342,14 +357,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -394,31 +413,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java index 038abf3f97..c1d6d84612 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -302,29 +303,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -342,14 +357,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -394,31 +413,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/ItemTable.java index 038abf3f97..c1d6d84612 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -302,29 +303,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -342,14 +357,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -394,31 +413,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/ItemTable.java index 038abf3f97..c1d6d84612 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -302,29 +303,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -342,14 +357,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -394,31 +413,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java index 34ee28cf47..1eff6ad979 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -299,29 +300,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -339,14 +354,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -391,31 +410,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/ItemTable.java index b529270079..19449a60ed 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -314,29 +315,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -354,14 +369,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -406,31 +425,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/ItemTable.java index c172609455..e73ed4ea27 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -314,29 +315,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -354,14 +369,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -406,31 +425,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/ItemTable.java index c172609455..e73ed4ea27 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.commons.util.file.filter.XMLFilter; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -314,29 +315,43 @@ public class ItemTable item.setCount(count); } - if (Config.LOG_ITEMS && !process.equals("Reset")) + 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_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CREATE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } } @@ -354,14 +369,18 @@ public class ItemTable final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" // - , String.valueOf(process) // in case of null - + "(id: " + itemId // - + " count: " + count // - + " name: " + item.getItemName() // - + " objId: " + item.getObjectId() + ")" // - , targetName // - , "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(String.valueOf(process)); // in case of null + sb.append("(id: "); + sb.append(itemId); + sb.append(" count: "); + sb.append(count); + sb.append(" name: "); + sb.append(item.getItemName()); + sb.append(" objId: "); + sb.append(item.getObjectId()); + sb.append(")"); + GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } @@ -406,31 +425,47 @@ public class ItemTable World.getInstance().removeObject(item); IdManager.getInstance().releaseId(item.getObjectId()); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) + if (item.getEnchantLevel() > 0) { - if (item.getEnchantLevel() > 0) - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":+" + item.getEnchantLevel() // - + " " + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } - else - { - LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null - + ", item " + item.getObjectId() // - + ":" + item.getTemplate().getName() // - + "(" + item.getCount() // - + "), PrevCount(" + old // - + "), " + String.valueOf(actor) // in case of null - + ", " + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":+"); + sb.append(item.getEnchantLevel()); + sb.append(" "); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("DELETE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(item.getObjectId()); + sb.append(":"); + sb.append(item.getTemplate().getName()); + sb.append("("); + sb.append(item.getCount()); + sb.append("), PrevCount("); + sb.append(old); + sb.append("), "); + sb.append(String.valueOf(actor)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOGGER_ITEMS.info(sb.toString()); } }