From 15852c55556e55e3e9d7dbde977f558481ccf698 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 25 Oct 2017 21:50:08 +0000
Subject: [PATCH] Log items even with null values.

---
 .../gameserver/datatables/ItemTable.java      | 164 ++++++++----------
 .../gameserver/datatables/ItemTable.java      | 164 ++++++++----------
 .../gameserver/datatables/ItemTable.java      | 164 ++++++++----------
 .../gameserver/datatables/ItemTable.java      | 164 ++++++++----------
 4 files changed, 304 insertions(+), 352 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 799e8d774e..7454554076 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
@@ -251,56 +251,50 @@ public class ItemTable
 		{
 			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
 			{
-				if ((actor != null) && (reference != null)) // NPE check
+				if (item.getEnchantLevel() > 0)
 				{
-					if (item.getEnchantLevel() > 0)
-					{
-						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:" + String.valueOf(process) // in case of null
+						+ ", item " + item.getObjectId() //
+						+ ":+" + item.getEnchantLevel() //
+						+ " " + item.getItem().getName() //
+						+ "(" + item.getCount() //
+						+ "), " + String.valueOf(actor) // in case of null
+						+ ", " + String.valueOf(reference)); // in case of null
+				}
+				else
+				{
+					LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null
+						+ ", item " + item.getObjectId() //
+						+ ":" + item.getItem().getName() //
+						+ "(" + item.getCount() //
+						+ "), " + String.valueOf(actor) // in case of null
+						+ ", " + String.valueOf(reference)); // in case of null
 				}
 			}
 		}
 		
-		if (actor != null)
+		if ((actor != null) && actor.isGM())
 		{
-			if (actor.isGM())
+			String referenceName = "no-reference";
+			if (reference instanceof L2Object)
 			{
-				String referenceName = "no-reference";
-				if (reference instanceof L2Object)
-				{
-					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-				}
-				else if (reference instanceof String)
-				{
-					referenceName = (String) reference;
-				}
-				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);
-				}
+				referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			if (Config.GMAUDIT)
+			{
+				GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" //
+					, String.valueOf(process) // in case of null
+						+ "(id: " + itemId //
+						+ " count: " + count //
+						+ " name: " + item.getItemName() //
+						+ " objId: " + item.getObjectId() + ")" //
+					, targetName //
+					, "L2Object referencing this action is: " + referenceName);
 			}
 		}
 		
@@ -344,58 +338,52 @@ public class ItemTable
 			{
 				if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
 				{
-					if ((actor != null) && (reference != null)) // NPE check
+					if (item.getEnchantLevel() > 0)
 					{
-						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);
-						}
+						LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null
+							+ ", item " + item.getObjectId() //
+							+ ":+" + item.getEnchantLevel() //
+							+ " " + item.getItem().getName() //
+							+ "(" + item.getCount() //
+							+ "), PrevCount(" + old //
+							+ "), " + String.valueOf(actor) // in case of null
+							+ ", " + String.valueOf(reference)); // in case of null
+					}
+					else
+					{
+						LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null
+							+ ", item " + item.getObjectId() //
+							+ ":" + item.getItem().getName() //
+							+ "(" + item.getCount() //
+							+ "), PrevCount(" + old //
+							+ "), " + String.valueOf(actor) // in case of null
+							+ ", " + String.valueOf(reference)); // in case of null
 					}
 				}
 			}
 			
-			if (actor != null)
+			if ((actor != null) && actor.isGM())
 			{
-				if (actor.isGM())
+				String referenceName = "no-reference";
+				if (reference instanceof L2Object)
 				{
-					String referenceName = "no-reference";
-					if (reference instanceof L2Object)
-					{
-						referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-					}
-					else if (reference instanceof String)
-					{
-						referenceName = (String) reference;
-					}
-					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);
-					}
+					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				if (Config.GMAUDIT)
+				{
+					GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" //
+						, String.valueOf(process) // in case of null
+							+ "(id: " + 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 799e8d774e..7454554076 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
@@ -251,56 +251,50 @@ public class ItemTable
 		{
 			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
 			{
-				if ((actor != null) && (reference != null)) // NPE check
+				if (item.getEnchantLevel() > 0)
 				{
-					if (item.getEnchantLevel() > 0)
-					{
-						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:" + String.valueOf(process) // in case of null
+						+ ", item " + item.getObjectId() //
+						+ ":+" + item.getEnchantLevel() //
+						+ " " + item.getItem().getName() //
+						+ "(" + item.getCount() //
+						+ "), " + String.valueOf(actor) // in case of null
+						+ ", " + String.valueOf(reference)); // in case of null
+				}
+				else
+				{
+					LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null
+						+ ", item " + item.getObjectId() //
+						+ ":" + item.getItem().getName() //
+						+ "(" + item.getCount() //
+						+ "), " + String.valueOf(actor) // in case of null
+						+ ", " + String.valueOf(reference)); // in case of null
 				}
 			}
 		}
 		
-		if (actor != null)
+		if ((actor != null) && actor.isGM())
 		{
-			if (actor.isGM())
+			String referenceName = "no-reference";
+			if (reference instanceof L2Object)
 			{
-				String referenceName = "no-reference";
-				if (reference instanceof L2Object)
-				{
-					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-				}
-				else if (reference instanceof String)
-				{
-					referenceName = (String) reference;
-				}
-				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);
-				}
+				referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			if (Config.GMAUDIT)
+			{
+				GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" //
+					, String.valueOf(process) // in case of null
+						+ "(id: " + itemId //
+						+ " count: " + count //
+						+ " name: " + item.getItemName() //
+						+ " objId: " + item.getObjectId() + ")" //
+					, targetName //
+					, "L2Object referencing this action is: " + referenceName);
 			}
 		}
 		
@@ -344,58 +338,52 @@ public class ItemTable
 			{
 				if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
 				{
-					if ((actor != null) && (reference != null)) // NPE check
+					if (item.getEnchantLevel() > 0)
 					{
-						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);
-						}
+						LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null
+							+ ", item " + item.getObjectId() //
+							+ ":+" + item.getEnchantLevel() //
+							+ " " + item.getItem().getName() //
+							+ "(" + item.getCount() //
+							+ "), PrevCount(" + old //
+							+ "), " + String.valueOf(actor) // in case of null
+							+ ", " + String.valueOf(reference)); // in case of null
+					}
+					else
+					{
+						LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null
+							+ ", item " + item.getObjectId() //
+							+ ":" + item.getItem().getName() //
+							+ "(" + item.getCount() //
+							+ "), PrevCount(" + old //
+							+ "), " + String.valueOf(actor) // in case of null
+							+ ", " + String.valueOf(reference)); // in case of null
 					}
 				}
 			}
 			
-			if (actor != null)
+			if ((actor != null) && actor.isGM())
 			{
-				if (actor.isGM())
+				String referenceName = "no-reference";
+				if (reference instanceof L2Object)
 				{
-					String referenceName = "no-reference";
-					if (reference instanceof L2Object)
-					{
-						referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-					}
-					else if (reference instanceof String)
-					{
-						referenceName = (String) reference;
-					}
-					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);
-					}
+					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				if (Config.GMAUDIT)
+				{
+					GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" //
+						, String.valueOf(process) // in case of null
+							+ "(id: " + 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 799e8d774e..7454554076 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
@@ -251,56 +251,50 @@ public class ItemTable
 		{
 			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
 			{
-				if ((actor != null) && (reference != null)) // NPE check
+				if (item.getEnchantLevel() > 0)
 				{
-					if (item.getEnchantLevel() > 0)
-					{
-						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:" + String.valueOf(process) // in case of null
+						+ ", item " + item.getObjectId() //
+						+ ":+" + item.getEnchantLevel() //
+						+ " " + item.getItem().getName() //
+						+ "(" + item.getCount() //
+						+ "), " + String.valueOf(actor) // in case of null
+						+ ", " + String.valueOf(reference)); // in case of null
+				}
+				else
+				{
+					LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null
+						+ ", item " + item.getObjectId() //
+						+ ":" + item.getItem().getName() //
+						+ "(" + item.getCount() //
+						+ "), " + String.valueOf(actor) // in case of null
+						+ ", " + String.valueOf(reference)); // in case of null
 				}
 			}
 		}
 		
-		if (actor != null)
+		if ((actor != null) && actor.isGM())
 		{
-			if (actor.isGM())
+			String referenceName = "no-reference";
+			if (reference instanceof L2Object)
 			{
-				String referenceName = "no-reference";
-				if (reference instanceof L2Object)
-				{
-					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-				}
-				else if (reference instanceof String)
-				{
-					referenceName = (String) reference;
-				}
-				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);
-				}
+				referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			if (Config.GMAUDIT)
+			{
+				GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" //
+					, String.valueOf(process) // in case of null
+						+ "(id: " + itemId //
+						+ " count: " + count //
+						+ " name: " + item.getItemName() //
+						+ " objId: " + item.getObjectId() + ")" //
+					, targetName //
+					, "L2Object referencing this action is: " + referenceName);
 			}
 		}
 		
@@ -344,58 +338,52 @@ public class ItemTable
 			{
 				if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
 				{
-					if ((actor != null) && (reference != null)) // NPE check
+					if (item.getEnchantLevel() > 0)
 					{
-						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);
-						}
+						LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null
+							+ ", item " + item.getObjectId() //
+							+ ":+" + item.getEnchantLevel() //
+							+ " " + item.getItem().getName() //
+							+ "(" + item.getCount() //
+							+ "), PrevCount(" + old //
+							+ "), " + String.valueOf(actor) // in case of null
+							+ ", " + String.valueOf(reference)); // in case of null
+					}
+					else
+					{
+						LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null
+							+ ", item " + item.getObjectId() //
+							+ ":" + item.getItem().getName() //
+							+ "(" + item.getCount() //
+							+ "), PrevCount(" + old //
+							+ "), " + String.valueOf(actor) // in case of null
+							+ ", " + String.valueOf(reference)); // in case of null
 					}
 				}
 			}
 			
-			if (actor != null)
+			if ((actor != null) && actor.isGM())
 			{
-				if (actor.isGM())
+				String referenceName = "no-reference";
+				if (reference instanceof L2Object)
 				{
-					String referenceName = "no-reference";
-					if (reference instanceof L2Object)
-					{
-						referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-					}
-					else if (reference instanceof String)
-					{
-						referenceName = (String) reference;
-					}
-					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);
-					}
+					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				if (Config.GMAUDIT)
+				{
+					GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" //
+						, String.valueOf(process) // in case of null
+							+ "(id: " + 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 799e8d774e..7454554076 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
@@ -251,56 +251,50 @@ public class ItemTable
 		{
 			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
 			{
-				if ((actor != null) && (reference != null)) // NPE check
+				if (item.getEnchantLevel() > 0)
 				{
-					if (item.getEnchantLevel() > 0)
-					{
-						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:" + String.valueOf(process) // in case of null
+						+ ", item " + item.getObjectId() //
+						+ ":+" + item.getEnchantLevel() //
+						+ " " + item.getItem().getName() //
+						+ "(" + item.getCount() //
+						+ "), " + String.valueOf(actor) // in case of null
+						+ ", " + String.valueOf(reference)); // in case of null
+				}
+				else
+				{
+					LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null
+						+ ", item " + item.getObjectId() //
+						+ ":" + item.getItem().getName() //
+						+ "(" + item.getCount() //
+						+ "), " + String.valueOf(actor) // in case of null
+						+ ", " + String.valueOf(reference)); // in case of null
 				}
 			}
 		}
 		
-		if (actor != null)
+		if ((actor != null) && actor.isGM())
 		{
-			if (actor.isGM())
+			String referenceName = "no-reference";
+			if (reference instanceof L2Object)
 			{
-				String referenceName = "no-reference";
-				if (reference instanceof L2Object)
-				{
-					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-				}
-				else if (reference instanceof String)
-				{
-					referenceName = (String) reference;
-				}
-				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);
-				}
+				referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			if (Config.GMAUDIT)
+			{
+				GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" //
+					, String.valueOf(process) // in case of null
+						+ "(id: " + itemId //
+						+ " count: " + count //
+						+ " name: " + item.getItemName() //
+						+ " objId: " + item.getObjectId() + ")" //
+					, targetName //
+					, "L2Object referencing this action is: " + referenceName);
 			}
 		}
 		
@@ -344,58 +338,52 @@ public class ItemTable
 			{
 				if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
 				{
-					if ((actor != null) && (reference != null)) // NPE check
+					if (item.getEnchantLevel() > 0)
 					{
-						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);
-						}
+						LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null
+							+ ", item " + item.getObjectId() //
+							+ ":+" + item.getEnchantLevel() //
+							+ " " + item.getItem().getName() //
+							+ "(" + item.getCount() //
+							+ "), PrevCount(" + old //
+							+ "), " + String.valueOf(actor) // in case of null
+							+ ", " + String.valueOf(reference)); // in case of null
+					}
+					else
+					{
+						LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null
+							+ ", item " + item.getObjectId() //
+							+ ":" + item.getItem().getName() //
+							+ "(" + item.getCount() //
+							+ "), PrevCount(" + old //
+							+ "), " + String.valueOf(actor) // in case of null
+							+ ", " + String.valueOf(reference)); // in case of null
 					}
 				}
 			}
 			
-			if (actor != null)
+			if ((actor != null) && actor.isGM())
 			{
-				if (actor.isGM())
+				String referenceName = "no-reference";
+				if (reference instanceof L2Object)
 				{
-					String referenceName = "no-reference";
-					if (reference instanceof L2Object)
-					{
-						referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
-					}
-					else if (reference instanceof String)
-					{
-						referenceName = (String) reference;
-					}
-					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);
-					}
+					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				if (Config.GMAUDIT)
+				{
+					GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]" //
+						, String.valueOf(process) // in case of null
+							+ "(id: " + item.getId() //
+							+ " count: " + item.getCount() //
+							+ " itemObjId: " //
+							+ item.getObjectId() + ")" //
+						, targetName //
+						, "L2Object referencing this action is: " + referenceName);
 				}
 			}