lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to guess and fix possible item logger NPE.

Browse Source
This commit is contained in:
MobiusDev 2017-10-20 22:20:52 +00:00
parent e3ac480982
commit 5e3ee38c0d
4 changed files with 204 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/ItemTable.java
View File

@ -255,11 +255,22 @@ public class ItemTable
{
if (item.getEnchantLevel() > 0)
{
LOGGER_ITEMS.info("CREATE:" + process + ", item " + item.getObjectId() + ":+" + item.getEnchantLevel() + " " + item.getItem().getName() + "(" + item.getCount() + "), " + actor + ", " + reference);
LOGGER_ITEMS.info("CREATE:" + process //
+ ", item " + item.getObjectId() //
+ ":+" + item.getEnchantLevel() //
+ " " + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), " + actor //
+ ", " + reference);
}
else
{
LOGGER_ITEMS.info("CREATE:" + process + ", item " + item.getObjectId() + ":" + item.getItem().getName() + "(" + item.getCount() + "), " + actor + ", " + reference);
LOGGER_ITEMS.info("CREATE:" + process //
+ ", item " + item.getObjectId() //
+ ":" + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), " + actor //
+ ", " + reference);
}
}
}
@ -281,7 +292,14 @@ public class ItemTable
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
if (Config.GMAUDIT)
{
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + itemId + " count: " + count + " name: " + item.getItemName() + " objId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName);
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]"//
, process //
+ "(id: " + itemId //
+ " count: " + count //
+ " name: " + item.getItemName() //
+ " objId: " + item.getObjectId() + ")" //
, targetName //
, "L2Object referencing this action is: " + referenceName);
}
}
}
@ -326,13 +344,29 @@ public class ItemTable
{
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
{
if (item.getEnchantLevel() > 0)
if ((actor != null) && (reference != null)) // NPE check
{
LOGGER_ITEMS.info("DELETE:" + process + ", item " + item.getObjectId() + ":+" + item.getEnchantLevel() + " " + item.getItem().getName() + "(" + item.getCount() + "), PrevCount(" + old + "), " + actor + ", " + reference);
}
else
{
LOGGER_ITEMS.info("DELETE:" + process + ", item " + item.getObjectId() + ":" + item.getItem().getName() + "(" + item.getCount() + "), PrevCount(" + old + "), " + actor + ", " + reference);
if (item.getEnchantLevel() > 0)
{
LOGGER_ITEMS.info("DELETE:" + process //
+ ", item " + item.getObjectId() //
+ ":+" + item.getEnchantLevel() //
+ " " + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), PrevCount(" + old //
+ "), " + actor //
+ ", " + reference);
}
else
{
LOGGER_ITEMS.info("DELETE:" + process //
+ ", item " + item.getObjectId() //
+ ":" + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), PrevCount(" + old //
+ "), " + actor //
+ ", " + reference);
}
}
}
}
@ -353,7 +387,14 @@ public class ItemTable
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
if (Config.GMAUDIT)
{
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + item.getId() + " count: " + item.getCount() + " itemObjId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName);
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" //
, process //
+ "(id: " + item.getId() //
+ " count: " + item.getCount() //
+ " itemObjId: " //
+ item.getObjectId() + ")" //
, targetName //
, "L2Object referencing this action is: " + referenceName);
}
}
}

61
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/ItemTable.java
View File

@ -255,11 +255,22 @@ public class ItemTable
{
if (item.getEnchantLevel() > 0)
{
LOGGER_ITEMS.info("CREATE:" + process + ", item " + item.getObjectId() + ":+" + item.getEnchantLevel() + " " + item.getItem().getName() + "(" + item.getCount() + "), " + actor + ", " + reference);
LOGGER_ITEMS.info("CREATE:" + process //
+ ", item " + item.getObjectId() //
+ ":+" + item.getEnchantLevel() //
+ " " + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), " + actor //
+ ", " + reference);
}
else
{
LOGGER_ITEMS.info("CREATE:" + process + ", item " + item.getObjectId() + ":" + item.getItem().getName() + "(" + item.getCount() + "), " + actor + ", " + reference);
LOGGER_ITEMS.info("CREATE:" + process //
+ ", item " + item.getObjectId() //
+ ":" + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), " + actor //
+ ", " + reference);
}
}
}
@ -281,7 +292,14 @@ public class ItemTable
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
if (Config.GMAUDIT)
{
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + itemId + " count: " + count + " name: " + item.getItemName() + " objId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName);
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]"//
, process //
+ "(id: " + itemId //
+ " count: " + count //
+ " name: " + item.getItemName() //
+ " objId: " + item.getObjectId() + ")" //
, targetName //
, "L2Object referencing this action is: " + referenceName);
}
}
}
@ -326,13 +344,29 @@ public class ItemTable
{
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
{
if (item.getEnchantLevel() > 0)
if ((actor != null) && (reference != null)) // NPE check
{
LOGGER_ITEMS.info("DELETE:" + process + ", item " + item.getObjectId() + ":+" + item.getEnchantLevel() + " " + item.getItem().getName() + "(" + item.getCount() + "), PrevCount(" + old + "), " + actor + ", " + reference);
}
else
{
LOGGER_ITEMS.info("DELETE:" + process + ", item " + item.getObjectId() + ":" + item.getItem().getName() + "(" + item.getCount() + "), PrevCount(" + old + "), " + actor + ", " + reference);
if (item.getEnchantLevel() > 0)
{
LOGGER_ITEMS.info("DELETE:" + process //
+ ", item " + item.getObjectId() //
+ ":+" + item.getEnchantLevel() //
+ " " + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), PrevCount(" + old //
+ "), " + actor //
+ ", " + reference);
}
else
{
LOGGER_ITEMS.info("DELETE:" + process //
+ ", item " + item.getObjectId() //
+ ":" + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), PrevCount(" + old //
+ "), " + actor //
+ ", " + reference);
}
}
}
}
@ -353,7 +387,14 @@ public class ItemTable
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
if (Config.GMAUDIT)
{
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + item.getId() + " count: " + item.getCount() + " itemObjId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName);
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" //
, process //
+ "(id: " + item.getId() //
+ " count: " + item.getCount() //
+ " itemObjId: " //
+ item.getObjectId() + ")" //
, targetName //
, "L2Object referencing this action is: " + referenceName);
}
}
}

61
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/ItemTable.java
View File

@ -255,11 +255,22 @@ public class ItemTable
{
if (item.getEnchantLevel() > 0)
{
LOGGER_ITEMS.info("CREATE:" + process + ", item " + item.getObjectId() + ":+" + item.getEnchantLevel() + " " + item.getItem().getName() + "(" + item.getCount() + "), " + actor + ", " + reference);
LOGGER_ITEMS.info("CREATE:" + process //
+ ", item " + item.getObjectId() //
+ ":+" + item.getEnchantLevel() //
+ " " + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), " + actor //
+ ", " + reference);
}
else
{
LOGGER_ITEMS.info("CREATE:" + process + ", item " + item.getObjectId() + ":" + item.getItem().getName() + "(" + item.getCount() + "), " + actor + ", " + reference);
LOGGER_ITEMS.info("CREATE:" + process //
+ ", item " + item.getObjectId() //
+ ":" + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), " + actor //
+ ", " + reference);
}
}
}
@ -281,7 +292,14 @@ public class ItemTable
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
if (Config.GMAUDIT)
{
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + itemId + " count: " + count + " name: " + item.getItemName() + " objId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName);
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]"//
, process //
+ "(id: " + itemId //
+ " count: " + count //
+ " name: " + item.getItemName() //
+ " objId: " + item.getObjectId() + ")" //
, targetName //
, "L2Object referencing this action is: " + referenceName);
}
}
}
@ -326,13 +344,29 @@ public class ItemTable
{
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
{
if (item.getEnchantLevel() > 0)
if ((actor != null) && (reference != null)) // NPE check
{
LOGGER_ITEMS.info("DELETE:" + process + ", item " + item.getObjectId() + ":+" + item.getEnchantLevel() + " " + item.getItem().getName() + "(" + item.getCount() + "), PrevCount(" + old + "), " + actor + ", " + reference);
}
else
{
LOGGER_ITEMS.info("DELETE:" + process + ", item " + item.getObjectId() + ":" + item.getItem().getName() + "(" + item.getCount() + "), PrevCount(" + old + "), " + actor + ", " + reference);
if (item.getEnchantLevel() > 0)
{
LOGGER_ITEMS.info("DELETE:" + process //
+ ", item " + item.getObjectId() //
+ ":+" + item.getEnchantLevel() //
+ " " + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), PrevCount(" + old //
+ "), " + actor //
+ ", " + reference);
}
else
{
LOGGER_ITEMS.info("DELETE:" + process //
+ ", item " + item.getObjectId() //
+ ":" + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), PrevCount(" + old //
+ "), " + actor //
+ ", " + reference);
}
}
}
}
@ -353,7 +387,14 @@ public class ItemTable
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
if (Config.GMAUDIT)
{
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + item.getId() + " count: " + item.getCount() + " itemObjId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName);
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" //
, process //
+ "(id: " + item.getId() //
+ " count: " + item.getCount() //
+ " itemObjId: " //
+ item.getObjectId() + ")" //
, targetName //
, "L2Object referencing this action is: " + referenceName);
}
}
}

61
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/ItemTable.java
View File

@ -255,11 +255,22 @@ public class ItemTable
{
if (item.getEnchantLevel() > 0)
{
LOGGER_ITEMS.info("CREATE:" + process + ", item " + item.getObjectId() + ":+" + item.getEnchantLevel() + " " + item.getItem().getName() + "(" + item.getCount() + "), " + actor + ", " + reference);
LOGGER_ITEMS.info("CREATE:" + process //
+ ", item " + item.getObjectId() //
+ ":+" + item.getEnchantLevel() //
+ " " + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), " + actor //
+ ", " + reference);
}
else
{
LOGGER_ITEMS.info("CREATE:" + process + ", item " + item.getObjectId() + ":" + item.getItem().getName() + "(" + item.getCount() + "), " + actor + ", " + reference);
LOGGER_ITEMS.info("CREATE:" + process //
+ ", item " + item.getObjectId() //
+ ":" + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), " + actor //
+ ", " + reference);
}
}
}
@ -281,7 +292,14 @@ public class ItemTable
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
if (Config.GMAUDIT)
{
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + itemId + " count: " + count + " name: " + item.getItemName() + " objId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName);
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]"//
, process //
+ "(id: " + itemId //
+ " count: " + count //
+ " name: " + item.getItemName() //
+ " objId: " + item.getObjectId() + ")" //
, targetName //
, "L2Object referencing this action is: " + referenceName);
}
}
}
@ -326,13 +344,29 @@ public class ItemTable
{
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
{
if (item.getEnchantLevel() > 0)
if ((actor != null) && (reference != null)) // NPE check
{
LOGGER_ITEMS.info("DELETE:" + process + ", item " + item.getObjectId() + ":+" + item.getEnchantLevel() + " " + item.getItem().getName() + "(" + item.getCount() + "), PrevCount(" + old + "), " + actor + ", " + reference);
}
else
{
LOGGER_ITEMS.info("DELETE:" + process + ", item " + item.getObjectId() + ":" + item.getItem().getName() + "(" + item.getCount() + "), PrevCount(" + old + "), " + actor + ", " + reference);
if (item.getEnchantLevel() > 0)
{
LOGGER_ITEMS.info("DELETE:" + process //
+ ", item " + item.getObjectId() //
+ ":+" + item.getEnchantLevel() //
+ " " + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), PrevCount(" + old //
+ "), " + actor //
+ ", " + reference);
}
else
{
LOGGER_ITEMS.info("DELETE:" + process //
+ ", item " + item.getObjectId() //
+ ":" + item.getItem().getName() //
+ "(" + item.getCount() //
+ "), PrevCount(" + old //
+ "), " + actor //
+ ", " + reference);
}
}
}
}
@ -353,7 +387,14 @@ public class ItemTable
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
if (Config.GMAUDIT)
{
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + item.getId() + " count: " + item.getCount() + " itemObjId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName);
GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" //
, process //
+ "(id: " + item.getId() //
+ " count: " + item.getCount() //
+ " itemObjId: " //
+ item.getObjectId() + ")" //
, targetName //
, "L2Object referencing this action is: " + referenceName);
}
}
}