From 463c15f650c478f905760fcf1e02e3eb2cb33261 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 27 Sep 2022 23:18:29 +0000 Subject: [PATCH] Make use of StringBuilder for Item logs. --- .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ .../gameserver/model/item/instance/Item.java | 141 ++++++++++++------ 27 files changed, 2565 insertions(+), 1242 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java index a2ae5fd746..11dacdff5c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -312,29 +313,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -352,7 +367,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -484,31 +506,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -526,7 +564,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 8bbcbc6ce1..cb8eb32ef2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -317,29 +318,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -357,7 +372,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -489,31 +511,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -531,7 +569,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 8bbcbc6ce1..cb8eb32ef2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -317,29 +318,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -357,7 +372,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -489,31 +511,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -531,7 +569,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 36089fe8e7..b7802ce89d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -317,29 +318,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -357,7 +372,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -489,31 +511,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -531,7 +569,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 5d88f23c6d..12efd7678b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -324,29 +325,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -364,7 +379,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -496,31 +518,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -538,7 +576,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 5d88f23c6d..12efd7678b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -324,29 +325,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -364,7 +379,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -496,31 +518,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -538,7 +576,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 5d88f23c6d..12efd7678b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -324,29 +325,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -364,7 +379,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -496,31 +518,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -538,7 +576,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 5d88f23c6d..12efd7678b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -324,29 +325,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -364,7 +379,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -496,31 +518,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -538,7 +576,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 12317d4698..05453736e6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -324,29 +325,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -364,7 +379,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -496,31 +518,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -538,7 +576,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 12317d4698..05453736e6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -324,29 +325,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -364,7 +379,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -496,31 +518,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -538,7 +576,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 12317d4698..05453736e6 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -324,29 +325,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -364,7 +379,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -496,31 +518,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -538,7 +576,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 574406fa26..e086daf6f7 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -32,6 +32,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.OptionData; @@ -290,29 +291,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -330,7 +345,14 @@ public class Item extends WorldObject final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target"; if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -462,31 +484,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -504,7 +542,18 @@ public class Item extends WorldObject final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target"; if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java index a83eb26ed7..832404117f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -32,6 +32,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.OptionData; @@ -293,29 +294,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -333,7 +348,14 @@ public class Item extends WorldObject final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target"; if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -465,31 +487,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -507,7 +545,18 @@ public class Item extends WorldObject final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target"; if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java index a83eb26ed7..832404117f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -32,6 +32,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.OptionData; @@ -293,29 +294,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -333,7 +348,14 @@ public class Item extends WorldObject final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target"; if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -465,31 +487,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -507,7 +545,18 @@ public class Item extends WorldObject final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target"; if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/instance/Item.java index e9c19c73e5..123d8ee1fb 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -312,29 +313,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -352,7 +367,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -484,31 +506,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -526,7 +564,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/instance/Item.java index e9c19c73e5..123d8ee1fb 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -312,29 +313,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -352,7 +367,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -484,31 +506,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -526,7 +564,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 36089fe8e7..b7802ce89d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -317,29 +318,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -357,7 +372,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -489,31 +511,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -531,7 +569,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 36089fe8e7..b7802ce89d 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -317,29 +318,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -357,7 +372,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -489,31 +511,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -531,7 +569,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 11cd3c55fd..853d5e3c7b 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -321,29 +322,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -361,7 +376,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -493,31 +515,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -535,7 +573,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 11cd3c55fd..853d5e3c7b 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -321,29 +322,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -361,7 +376,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -493,31 +515,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -535,7 +573,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 11cd3c55fd..853d5e3c7b 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -321,29 +322,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -361,7 +376,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -493,31 +515,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -535,7 +573,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 11cd3c55fd..853d5e3c7b 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -321,29 +322,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -361,7 +376,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -493,31 +515,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -535,7 +573,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 11cd3c55fd..853d5e3c7b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -321,29 +322,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -361,7 +376,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -493,31 +515,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -535,7 +573,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java index dc861c2429..501276c320 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -312,29 +313,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -352,7 +367,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -484,31 +506,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -526,7 +564,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java index bd138d6803..d9a8dd0938 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -324,29 +325,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -364,7 +379,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -496,31 +518,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -538,7 +576,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java index bd138d6803..d9a8dd0938 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -324,29 +325,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -364,7 +379,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -496,31 +518,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -538,7 +576,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/instance/Item.java index e97243a111..a30ce8fd6d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,6 +35,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -324,29 +325,43 @@ public class Item extends WorldObject { setOwnerId(ownerId); - if (Config.LOG_ITEMS) + if (Config.LOG_ITEMS && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), " // - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("SETOWNER:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -364,7 +379,14 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " name: " + getName() + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" name: "); + sb.append(getName()); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } } @@ -496,31 +518,47 @@ public class Item extends WorldObject _storedInDb = false; - if (Config.LOG_ITEMS && (process != null)) + if (Config.LOG_ITEMS && (process != null) && (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))) { - if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID)))) + if (_enchantLevel > 0) { - if (_enchantLevel > 0) - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":+" + _enchantLevel // - + " " + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } - else - { - LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null - + ", item " + getObjectId() // - + ":" + _itemTemplate.getName() // - + "(" + _count + "), PrevCount(" // - + String.valueOf(old) + "), " // in case of null - + String.valueOf(creator) + ", " // in case of null - + String.valueOf(reference)); // in case of null - } + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":+"); + sb.append(_enchantLevel); + sb.append(" "); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); + } + else + { + final StringBuilder sb = new StringBuilder(); + sb.append("CHANGE:"); + sb.append(String.valueOf(process)); // in case of null + sb.append(", item "); + sb.append(getObjectId()); + sb.append(":"); + sb.append(_itemTemplate.getName()); + sb.append("("); + sb.append(_count); + sb.append("), PrevCount("); + sb.append(String.valueOf(old)); // in case of null + sb.append("), "); + sb.append(String.valueOf(creator)); // in case of null + sb.append(", "); + sb.append(String.valueOf(reference)); // in case of null + LOG_ITEMS.info(sb.toString()); } } @@ -538,7 +576,18 @@ public class Item extends WorldObject final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); if (Config.GMAUDIT) { - GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + _itemId + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "Object referencing this action is: " + referenceName); + final StringBuilder sb = new StringBuilder(); + sb.append(process); + sb.append("(id: "); + sb.append(_itemId); + sb.append(" objId: "); + sb.append(getObjectId()); + sb.append(" name: "); + sb.append(getName()); + sb.append(" count: "); + sb.append(count); + sb.append(")"); + GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName)); } } }