Moved GM audit calculations after configuration is checked.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -340,19 +340,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -365,8 +353,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,19 +454,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -477,8 +465,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -353,8 +353,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -364,20 +374,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -550,19 +550,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -575,8 +563,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -340,19 +340,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -365,8 +353,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,19 +454,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -477,8 +465,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -358,8 +358,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -369,20 +379,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -555,19 +555,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -580,8 +568,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -340,19 +340,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -365,8 +353,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,19 +454,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -477,8 +465,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -358,8 +358,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -369,20 +379,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -555,19 +555,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -580,8 +568,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -340,19 +340,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -365,8 +353,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,19 +454,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -477,8 +465,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -358,8 +358,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -369,20 +379,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -555,19 +555,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -580,8 +568,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -341,19 +341,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -366,8 +354,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -455,19 +455,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -478,8 +466,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -365,8 +365,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -376,20 +386,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -562,19 +562,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -587,8 +575,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -343,19 +343,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -368,8 +356,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,19 +457,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -480,8 +468,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -365,8 +365,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -376,20 +386,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -562,19 +562,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -587,8 +575,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -343,19 +343,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -368,8 +356,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,19 +457,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -480,8 +468,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -365,8 +365,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -376,20 +386,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -562,19 +562,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -587,8 +575,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -343,19 +343,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -368,8 +356,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,19 +457,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -480,8 +468,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -365,8 +365,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -376,20 +386,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -562,19 +562,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -587,8 +575,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -355,19 +355,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -380,8 +368,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -469,19 +469,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -492,8 +480,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -365,8 +365,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -376,20 +386,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -562,19 +562,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -587,8 +575,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -355,19 +355,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -380,8 +368,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -469,19 +469,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -492,8 +480,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -365,8 +365,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -376,20 +386,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -562,19 +562,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -587,8 +575,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -355,19 +355,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -380,8 +368,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -469,19 +469,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -492,8 +480,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -365,8 +365,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -376,20 +386,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -562,19 +562,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -587,8 +575,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -332,19 +332,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -357,8 +345,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -446,19 +446,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -469,8 +457,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -331,8 +331,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -342,20 +352,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -528,19 +528,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = ((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name";
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -553,8 +541,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = ((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name";
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -338,19 +338,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -363,8 +351,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -452,19 +452,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -475,8 +463,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -334,8 +334,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -345,20 +355,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -531,19 +531,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = ((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name";
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -556,8 +544,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = ((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name";
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -338,19 +338,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -363,8 +351,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -452,19 +452,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -475,8 +463,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -334,8 +334,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -345,20 +355,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -531,19 +531,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = ((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name";
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -556,8 +544,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = ((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name";
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -340,19 +340,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -365,8 +353,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,19 +454,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -477,8 +465,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -353,8 +353,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -364,20 +374,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -550,19 +550,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -575,8 +563,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -340,19 +340,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -365,8 +353,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,19 +454,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -477,8 +465,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -353,8 +353,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -364,20 +374,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -550,19 +550,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -575,8 +563,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -340,19 +340,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -365,8 +353,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,19 +454,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -477,8 +465,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -358,8 +358,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -369,20 +379,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -555,19 +555,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -580,8 +568,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -340,19 +340,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -365,8 +353,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,19 +454,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -477,8 +465,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -358,8 +358,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -369,20 +379,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -555,19 +555,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -580,8 +568,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -341,19 +341,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -366,8 +354,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -455,19 +455,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -478,8 +466,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -362,8 +362,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -373,20 +383,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -559,19 +559,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -584,8 +572,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -343,19 +343,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -368,8 +356,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,19 +457,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -480,8 +468,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -362,8 +362,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -373,20 +383,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -559,19 +559,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -584,8 +572,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -343,19 +343,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -368,8 +356,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,19 +457,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -480,8 +468,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -362,8 +362,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -373,20 +383,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -559,19 +559,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -584,8 +572,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -343,19 +343,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -368,8 +356,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,19 +457,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -480,8 +468,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -362,8 +362,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -373,20 +383,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -559,19 +559,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -584,8 +572,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -343,19 +343,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -368,8 +356,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,19 +457,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -480,8 +468,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -362,8 +362,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -373,20 +383,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -559,19 +559,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -584,8 +572,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -340,19 +340,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -365,8 +353,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,19 +454,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -477,8 +465,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -353,8 +353,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -364,20 +374,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -550,19 +550,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -575,8 +563,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -355,19 +355,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -380,8 +368,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -469,19 +469,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -492,8 +480,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -365,8 +365,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -376,20 +386,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -562,19 +562,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -587,8 +575,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -355,19 +355,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -380,8 +368,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -469,19 +469,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -492,8 +480,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -365,8 +365,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -376,20 +386,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -562,19 +562,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -587,8 +575,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -355,19 +355,7 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -380,8 +368,20 @@ public class ItemTable
 			sb.append(" objId: ");
 			sb.append(item.getObjectId());
 			sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -469,19 +469,7 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
-			{
-				String referenceName = "no-reference";
-				if (reference instanceof WorldObject)
-				{
-					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) 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)
 			{
 				final StringBuilder sb = new StringBuilder();
 				sb.append(process);
@@ -492,8 +480,20 @@ public class ItemTable
 				sb.append(" itemObjId: ");
 				sb.append(item.getObjectId());
 				sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
+				String referenceName = "no-reference";
+				if (reference instanceof WorldObject)
+				{
+					referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 				}
+				else if (reference instanceof String)
+				{
+					referenceName = (String) reference;
+				}
+				
+				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 			}
 			
 			// if it's a pet control item, delete the pet as well

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -365,8 +365,18 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(_itemId);
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -376,20 +386,10 @@ public class Item extends WorldObject
 			{
 				referenceName = (String) reference;
 			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
-			if (Config.GMAUDIT)
-			{
-				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));
 		}
 	}
-	}
 	
 	/**
 	 * Sets the ownerID of the item
@@ -562,19 +562,7 @@ public class Item extends WorldObject
 			}
 		}
 		
-		if ((creator != null) && creator.isGM())
+		if ((creator != null) && creator.isGM() && Config.GMAUDIT)
-		{
-			String referenceName = "no-reference";
-			if (reference instanceof WorldObject)
-			{
-				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
-			}
-			else if (reference instanceof String)
-			{
-				referenceName = (String) reference;
-			}
-			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
-			if (Config.GMAUDIT)
 		{
 			final StringBuilder sb = new StringBuilder();
 			sb.append(process);
@@ -587,8 +575,20 @@ public class Item extends WorldObject
 			sb.append(" count: ");
 			sb.append(count);
 			sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
+			String referenceName = "no-reference";
+			if (reference instanceof WorldObject)
+			{
+				referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
 			}
+			else if (reference instanceof String)
+			{
+				referenceName = (String) reference;
+			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}