From 5e3ee38c0d19cd5d7a5a18adc10d43733cf0d9cf Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 20 Oct 2017 22:20:52 +0000
Subject: [PATCH] Try to guess and fix possible item logger NPE.

---
 .../gameserver/datatables/ItemTable.java      | 61 ++++++++++++++++---
 .../gameserver/datatables/ItemTable.java      | 61 ++++++++++++++++---
 .../gameserver/datatables/ItemTable.java      | 61 ++++++++++++++++---
 .../gameserver/datatables/ItemTable.java      | 61 ++++++++++++++++---
 4 files changed, 204 insertions(+), 40 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/ItemTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/ItemTable.java
index 7d4504066b..799e8d774e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/ItemTable.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/ItemTable.java
@@ -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);
 					}
 				}
 			}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/ItemTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/ItemTable.java
index 7d4504066b..799e8d774e 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/ItemTable.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/ItemTable.java
@@ -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);
 					}
 				}
 			}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/ItemTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/ItemTable.java
index 7d4504066b..799e8d774e 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/ItemTable.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/ItemTable.java
@@ -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);
 					}
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/ItemTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/ItemTable.java
index 7d4504066b..799e8d774e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/ItemTable.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/ItemTable.java
@@ -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);
 					}
 				}
 			}