Make use of StringBuilder for Item logs.

This commit is contained in:
MobiusDevelopment
2022-09-27 23:18:29 +00:00
parent 008fef2e18
commit 463c15f650
27 changed files with 2565 additions and 1242 deletions

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
@@ -312,29 +313,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
@@ -317,29 +318,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
@@ -317,29 +318,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
@@ -317,29 +318,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -324,29 +325,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -324,29 +325,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -324,29 +325,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -324,29 +325,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -324,29 +325,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -324,29 +325,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -324,29 +325,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -32,6 +32,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
import org.l2jmobius.gameserver.data.xml.OptionData; import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -290,29 +291,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"; final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"; final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -32,6 +32,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
import org.l2jmobius.gameserver.data.xml.OptionData; import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -293,29 +294,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"; final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"; final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -32,6 +32,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
import org.l2jmobius.gameserver.data.xml.OptionData; import org.l2jmobius.gameserver.data.xml.OptionData;
@@ -293,29 +294,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"; final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"; final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
@@ -312,29 +313,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
@@ -312,29 +313,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
@@ -317,29 +318,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
@@ -317,29 +318,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -321,29 +322,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -321,29 +322,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -321,29 +322,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -321,29 +322,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -321,29 +322,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData;
@@ -312,29 +313,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -324,29 +325,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -324,29 +325,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }

View File

@@ -35,6 +35,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.StringUtil;
import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AgathionData;
import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData;
@@ -324,29 +325,43 @@ public class Item extends WorldObject
{ {
setOwnerId(ownerId); 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) final StringBuilder sb = new StringBuilder();
{ sb.append("SETOWNER:");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), " // sb.append(_enchantLevel);
+ String.valueOf(creator) + ", " // in case of null sb.append(" ");
+ String.valueOf(reference)); // in case of null sb.append(_itemTemplate.getName());
} sb.append("(");
else sb.append(_count);
{ sb.append("), ");
LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null sb.append(String.valueOf(creator)); // in case of null
+ ", item " + getObjectId() // sb.append(", ");
+ ":" + _itemTemplate.getName() // sb.append(String.valueOf(reference)); // in case of null
+ "(" + _count + "), " // LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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; _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) final StringBuilder sb = new StringBuilder();
{ sb.append("CHANGE:");
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append(String.valueOf(process)); // in case of null
+ ", item " + getObjectId() // sb.append(", item ");
+ ":+" + _enchantLevel // sb.append(getObjectId());
+ " " + _itemTemplate.getName() // sb.append(":+");
+ "(" + _count + "), PrevCount(" // sb.append(_enchantLevel);
+ String.valueOf(old) + "), " // in case of null sb.append(" ");
+ String.valueOf(creator) + ", " // in case of null sb.append(_itemTemplate.getName());
+ String.valueOf(reference)); // in case of null sb.append("(");
} sb.append(_count);
else sb.append("), PrevCount(");
{ sb.append(String.valueOf(old)); // in case of null
LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null sb.append("), ");
+ ", item " + getObjectId() // sb.append(String.valueOf(creator)); // in case of null
+ ":" + _itemTemplate.getName() // sb.append(", ");
+ "(" + _count + "), PrevCount(" // sb.append(String.valueOf(reference)); // in case of null
+ String.valueOf(old) + "), " // in case of null LOG_ITEMS.info(sb.toString());
+ String.valueOf(creator) + ", " // in case of null }
+ String.valueOf(reference)); // in case of null 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"); final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
if (Config.GMAUDIT) 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));
} }
} }
} }