Moved GM audit calculations after configuration is checked.

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

@@ -340,8 +340,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -351,22 +365,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,8 +454,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -465,20 +477,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +374,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -550,8 +550,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -561,22 +575,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +340,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -351,22 +365,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,8 +454,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -465,20 +477,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +379,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -555,8 +555,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -566,22 +580,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +340,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -351,22 +365,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,8 +454,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -465,20 +477,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +379,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -555,8 +555,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -566,22 +580,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +340,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -351,22 +365,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,8 +454,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -465,20 +477,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +379,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -555,8 +555,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -566,22 +580,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +341,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -352,22 +366,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -455,8 +455,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -466,20 +478,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +386,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -562,8 +562,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -573,22 +587,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +343,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -354,22 +368,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,8 +457,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -468,20 +480,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +386,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -562,8 +562,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -573,22 +587,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +343,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -354,22 +368,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,8 +457,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -468,20 +480,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +386,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -562,8 +562,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -573,22 +587,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +343,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -354,22 +368,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,8 +457,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -468,20 +480,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +386,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -562,8 +562,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -573,22 +587,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +355,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -366,22 +380,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -469,8 +469,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -480,20 +492,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +386,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -562,8 +562,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -573,22 +587,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +355,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -366,22 +380,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -469,8 +469,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -480,20 +492,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +386,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -562,8 +562,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -573,22 +587,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +355,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -366,22 +380,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -469,8 +469,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -480,20 +492,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +386,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -562,8 +562,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -573,22 +587,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +332,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -343,22 +357,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -446,8 +446,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -457,20 +469,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +352,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -528,8 +528,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -539,22 +553,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +338,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -349,22 +363,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -452,8 +452,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -463,20 +475,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +355,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -531,8 +531,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -542,22 +556,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +338,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -349,22 +363,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -452,8 +452,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -463,20 +475,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +355,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -531,8 +531,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -542,22 +556,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +340,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -351,22 +365,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,8 +454,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -465,20 +477,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +374,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -550,8 +550,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -561,22 +575,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +340,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -351,22 +365,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,8 +454,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -465,20 +477,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +374,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -550,8 +550,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -561,22 +575,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +340,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -351,22 +365,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,8 +454,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -465,20 +477,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +379,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -555,8 +555,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -566,22 +580,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +340,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -351,22 +365,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,8 +454,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -465,20 +477,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +379,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -555,8 +555,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -566,22 +580,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +341,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -352,22 +366,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -455,8 +455,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -466,20 +478,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +383,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -559,8 +559,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -570,22 +584,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +343,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -354,22 +368,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,8 +457,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -468,20 +480,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +383,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -559,8 +559,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -570,22 +584,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +343,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -354,22 +368,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,8 +457,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -468,20 +480,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +383,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -559,8 +559,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -570,22 +584,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +343,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -354,22 +368,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,8 +457,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -468,20 +480,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +383,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -559,8 +559,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -570,22 +584,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +343,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -354,22 +368,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -457,8 +457,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -468,20 +480,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +383,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -559,8 +559,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -570,22 +584,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +340,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -351,22 +365,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -454,8 +454,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -465,20 +477,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +374,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -550,8 +550,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -561,22 +575,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +355,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -366,22 +380,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -469,8 +469,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -480,20 +492,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +386,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -562,8 +562,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -573,22 +587,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +355,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -366,22 +380,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -469,8 +469,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -480,20 +492,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +386,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -562,8 +562,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -573,22 +587,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			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,8 +355,22 @@ public class ItemTable
 			}
 		}
 		
-		if ((actor != null) && actor.isGM())
+		if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 		{
+			final StringBuilder sb = new StringBuilder();
+			sb.append(process);
+			sb.append("(id: ");
+			sb.append(itemId);
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(" name: ");
+			sb.append(item.getItemName());
+			sb.append(" objId: ");
+			sb.append(item.getObjectId());
+			sb.append(")");
+			
+			final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -366,22 +380,8 @@ public class ItemTable
 			{
 				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);
-				sb.append("(id: ");
-				sb.append(itemId);
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(" name: ");
-				sb.append(item.getItemName());
-				sb.append(" objId: ");
-				sb.append(item.getObjectId());
-				sb.append(")");
-				GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 		
 		// Notify to scripts
@@ -469,8 +469,20 @@ public class ItemTable
 				}
 			}
 			
-			if ((actor != null) && actor.isGM())
+			if ((actor != null) && actor.isGM() && Config.GMAUDIT)
 			{
+				final StringBuilder sb = new StringBuilder();
+				sb.append(process);
+				sb.append("(id: ");
+				sb.append(item.getId());
+				sb.append(" count: ");
+				sb.append(item.getCount());
+				sb.append(" itemObjId: ");
+				sb.append(item.getObjectId());
+				sb.append(")");
+				
+				final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				
 				String referenceName = "no-reference";
 				if (reference instanceof WorldObject)
 				{
@@ -480,20 +492,8 @@ public class ItemTable
 				{
 					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);
-					sb.append("(id: ");
-					sb.append(item.getId());
-					sb.append(" count: ");
-					sb.append(item.getCount());
-					sb.append(" itemObjId: ");
-					sb.append(item.getObjectId());
-					sb.append(")");
-					GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-				}
+				
+				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,18 +386,8 @@ 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));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}
 	
@@ -562,8 +562,22 @@ 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(" objId: ");
+			sb.append(getObjectId());
+			sb.append(" name: ");
+			sb.append(getName());
+			sb.append(" count: ");
+			sb.append(count);
+			sb.append(")");
+			
+			final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+			
 			String referenceName = "no-reference";
 			if (reference instanceof WorldObject)
 			{
@@ -573,22 +587,8 @@ 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(" objId: ");
-				sb.append(getObjectId());
-				sb.append(" name: ");
-				sb.append(getName());
-				sb.append(" count: ");
-				sb.append(count);
-				sb.append(")");
-				GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
-			}
+			
+			GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
 		}
 	}